reshare in "display" view

diff --git a/mod/display.php b/mod/display.php
index 79eaf371782a3c2f00985a89b2531d1e5a662979..d96be4333bebc2ac4af56d47da159c07bf29e967 100755 (executable)
--- 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 482fb0e0dc69f56a59039e7a37459a8db20f258f..251b9cdd03e9bfd03b4cc2c0f8a81508973d7324 100755 (executable)
--- 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);
                        });