merge
This commit is contained in:
commit
54bb2651f5
@ -64,10 +64,13 @@ function display_content(&$a, $update = 0, $load = false) {
|
||||
'bang' => '',
|
||||
'visitor' => true,
|
||||
'profile_uid' => local_channel(),
|
||||
'return_path' => 'channel/' . $channel['channel_address']
|
||||
'return_path' => 'channel/' . $channel['channel_address'],
|
||||
'expanded' => true
|
||||
);
|
||||
|
||||
$o = '<div id="jot-popup">';
|
||||
$o .= status_editor($a,$x);
|
||||
$o .= '</div>';
|
||||
|
||||
}
|
||||
|
||||
|
@ -1 +1 @@
|
||||
2015-07-06.1085
|
||||
2015-07-10.1089
|
||||
|
Reference in New Issue
Block a user