diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-30 12:05:49 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-30 12:05:49 +0100 |
| commit | 76484f154124ccade9efd3a6b704692112a97477 (patch) | |
| tree | 51919a98826ee650dd9f04d111527a494810d29b /include/identity.php | |
| parent | 9abff11f86b70b22d5a95105b8c54755f536ac0d (diff) | |
| parent | b6543beca2f0e5e353b497099e3fa6b29bf47233 (diff) | |
| download | volse-hubzilla-76484f154124ccade9efd3a6b704692112a97477.tar.gz volse-hubzilla-76484f154124ccade9efd3a6b704692112a97477.tar.bz2 volse-hubzilla-76484f154124ccade9efd3a6b704692112a97477.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/identity.php')
| -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; |