diff options
| -rwxr-xr-x | mod/display.php | 14 | ||||
| -rwxr-xr-x | view/jot-header.tpl | 5 |
2 files changed, 16 insertions, 3 deletions
diff --git a/mod/display.php b/mod/display.php index 79eaf3717..d96be4333 100755 --- a/mod/display.php +++ b/mod/display.php @@ -11,6 +11,7 @@ function display_content(&$a) { require_once("include/bbcode.php"); require_once('include/security.php'); require_once('include/conversation.php'); + require_once('include/acl_selectors.php'); $o = '<div id="live-display"></div>' . "\r\n"; @@ -68,6 +69,19 @@ function display_content(&$a) { } if ($is_owner) + $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false); + + $x = array( + 'is_owner' => true, + 'allow_location' => $a->user['allow_location'], + 'default_location' => $a->user['default_location'], + 'nickname' => $a->user['nickname'], + 'lockstate' => ((($group) || (is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'), + 'acl' => populate_acl((($group || $cid) ? $def_acl : $a->user), $celeb), + 'bang' => (($group || $cid) ? '!' : ''), + 'visitor' => 'block', + 'profile_uid' => local_user() + ); $o .= status_editor($a,$x,0,true); diff --git a/view/jot-header.tpl b/view/jot-header.tpl index 482fb0e0d..251b9cdd0 100755 --- a/view/jot-header.tpl +++ b/view/jot-header.tpl @@ -209,15 +209,14 @@ function enableOnUser(){ } function jotShare(id) { + if ($('#jot-popup').length != 0) $('#jot-popup').show(); + $('#like-rotator-' + id).show(); $.get('share/' + id, function(data) { if (!editor) $("#profile-jot-text").val(""); initEditor(function(){ addeditortext(data); $('#like-rotator-' + id).hide(); - if ($('#jot-popup').length != 0){ - $('#jot-popup').show(); - } $(window).scrollTop(0); }); |