diff options
Diffstat (limited to 'mod/profile.php')
| -rw-r--r-- | mod/profile.php | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/mod/profile.php b/mod/profile.php index b83dbdf3f..6680636a7 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -12,9 +12,6 @@ function profile_aside(&$a) { require_once('include/contact_widgets.php'); require_once('include/items.php'); - if(! x($a->page,'aside')) - $a->page['aside'] = ''; - if(argc() > 1) $which = argv(1); else { @@ -60,6 +57,8 @@ function profile_content(&$a, $update = 0) { return login(); } + $channel = $a->get_channel(); + require_once("include/bbcode.php"); require_once('include/security.php'); require_once('include/conversation.php'); @@ -147,16 +146,15 @@ function profile_content(&$a, $update = 0) { $celeb = ((($a->profile['page-flags'] == PAGE_SOAPBOX) || ($a->profile['page-flags'] == PAGE_COMMUNITY)) ? true : false); - if(can_write_wall($a,$a->profile['profile_uid'])) { $x = array( 'is_owner' => $is_owner, 'allow_location' => ((($is_owner || $commvisitor) && $a->profile['allow_location']) ? true : false), 'default_location' => (($is_owner) ? $a->user['default-location'] : ''), - 'nickname' => $a->profile['nickname'], - 'lockstate' => (((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' => (($is_owner) ? populate_acl($a->user, $celeb) : ''), + 'nickname' => $channel['channel_address'], + 'lockstate' => (((strlen($channel['channel_allow_cid'])) || (strlen($channel['channel_allow_gid'])) || (strlen($channel['channel_deny_cid'])) || (strlen($channel['channel_deny_gid']))) ? 'lock' : 'unlock'), + 'acl' => (($is_owner) ? populate_acl($channel, $celeb) : ''), 'bang' => '', 'visitor' => (($is_owner || $commvisitor) ? 'block' : 'none'), 'profile_uid' => $a->profile['profile_uid'] |