diff options
| author | mrjive <mrjive@mrjive.it> | 2016-02-01 11:25:07 +0100 |
|---|---|---|
| committer | mrjive <mrjive@mrjive.it> | 2016-02-01 11:25:07 +0100 |
| commit | 337735094b944fd31ed96e36c869227a0d63e5d1 (patch) | |
| tree | 763577a8373b26426dc131c58f6a7f8c9c9213bf /include/identity.php | |
| parent | 28943af494eae225b256b9771a5699a1b05d7a2f (diff) | |
| parent | 01b5b1347521951ca78b1718b03c45897800bf5e (diff) | |
| download | volse-hubzilla-337735094b944fd31ed96e36c869227a0d63e5d1.tar.gz volse-hubzilla-337735094b944fd31ed96e36c869227a0d63e5d1.tar.bz2 volse-hubzilla-337735094b944fd31ed96e36c869227a0d63e5d1.zip | |
Merge pull request #20 from redmatrix/master
updating from original codebase
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; |