diff options
| author | friendica <info@friendica.com> | 2012-10-24 22:21:35 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-10-24 22:21:35 -0700 |
| commit | 939543b26d102c388c3653a7727e95e1aae2223d (patch) | |
| tree | 2ef0fe3a7098f00fe07330dc4fee8d1eb83c400c /mod/profile.php | |
| parent | 05fd2c758c318f8beb441fb8b75e7328f1643e2a (diff) | |
| download | volse-hubzilla-939543b26d102c388c3653a7727e95e1aae2223d.tar.gz volse-hubzilla-939543b26d102c388c3653a7727e95e1aae2223d.tar.bz2 volse-hubzilla-939543b26d102c388c3653a7727e95e1aae2223d.zip | |
more progress on the main photos module
Diffstat (limited to 'mod/profile.php')
| -rw-r--r-- | mod/profile.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mod/profile.php b/mod/profile.php index 6680636a7..8ba9584b1 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -57,7 +57,6 @@ function profile_content(&$a, $update = 0) { return login(); } - $channel = $a->get_channel(); require_once("include/bbcode.php"); require_once('include/security.php'); @@ -127,7 +126,7 @@ function profile_content(&$a, $update = 0) { if(x($_GET,'tab')) $tab = notags(trim($_GET['tab'])); - $o.=profile_tabs($a, $is_owner, $a->profile['nickname']); + $o .= profile_tabs($a, $is_owner, $a->profile['channel_address']); if($tab === 'profile') { @@ -152,8 +151,8 @@ function profile_content(&$a, $update = 0) { 'is_owner' => $is_owner, 'allow_location' => ((($is_owner || $commvisitor) && $a->profile['allow_location']) ? true : false), 'default_location' => (($is_owner) ? $a->user['default-location'] : ''), - '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'), + 'nickname' => $a->profile['channel_address'], + 'lockstate' => (((strlen($a->profile['channel_allow_cid'])) || (strlen($a->profile['channel_allow_gid'])) || (strlen($a->profile['channel_deny_cid'])) || (strlen($a->profile['channel_deny_gid']))) ? 'lock' : 'unlock'), 'acl' => (($is_owner) ? populate_acl($channel, $celeb) : ''), 'bang' => '', 'visitor' => (($is_owner || $commvisitor) ? 'block' : 'none'), |