diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-01-30 00:31:09 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-01-30 00:31:09 +0100 |
| commit | 24f912e0b2ee72aa5c5d808f767b008f8bae01b7 (patch) | |
| tree | 8ba6611aedc47bca03b60fbbdd00970f5704aafc /include | |
| parent | d7abacb7b2737699d983862aa03628ee3d758545 (diff) | |
| parent | 08aeeadd7157d48fa3f4aff0cc2b58a314e508d2 (diff) | |
| download | volse-hubzilla-24f912e0b2ee72aa5c5d808f767b008f8bae01b7.tar.gz volse-hubzilla-24f912e0b2ee72aa5c5d808f767b008f8bae01b7.tar.bz2 volse-hubzilla-24f912e0b2ee72aa5c5d808f767b008f8bae01b7.zip | |
Merge branch 'master' of https://github.com/redmatrix/hubzilla
Diffstat (limited to 'include')
| -rw-r--r-- | include/identity.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/identity.php b/include/identity.php index fd0b4d7f5..e1e79394a 100644 --- a/include/identity.php +++ b/include/identity.php @@ -924,6 +924,10 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) { $pdesc = true; $reddress = true; + if(! perm_is_allowed($profile['uid'],((is_array($observer)) ? $observer['xchan_hash'] : ''),'view_profile')) { + $block = true; + } + if($block && intval(get_config('system','block_public_blackout'))) return $o; @@ -1012,9 +1016,6 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) { // logger('online: ' . $profile['online']); - if(! perm_is_allowed($profile['uid'],((is_array($observer)) ? $observer['xchan_hash'] : ''),'view_profile')) { - $block = true; - } if(($profile['hidewall'] && (! local_channel()) && (! remote_channel())) || $block ) { $location = $reddress = $pdesc = $gender = $marital = $homepage = False; |