diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-28 18:28:04 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-28 18:28:04 +0100 |
| commit | 9abff11f86b70b22d5a95105b8c54755f536ac0d (patch) | |
| tree | b33e978e38f0a64659d1c1e74ee68754c53f76b8 | |
| parent | d49c5b3d8e4f430bf72ed4e1ded2e1d08c10fd29 (diff) | |
| parent | 5f1eb18da4d6380b64e83e0eeda6f1037de2fec9 (diff) | |
| download | volse-hubzilla-9abff11f86b70b22d5a95105b8c54755f536ac0d.tar.gz volse-hubzilla-9abff11f86b70b22d5a95105b8c54755f536ac0d.tar.bz2 volse-hubzilla-9abff11f86b70b22d5a95105b8c54755f536ac0d.zip | |
Merge remote-tracking branch 'upstream/master'
| -rw-r--r-- | include/identity.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/identity.php b/include/identity.php index 32c4dd130..fd0b4d7f5 100644 --- a/include/identity.php +++ b/include/identity.php @@ -924,6 +924,9 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) { $pdesc = true; $reddress = true; + if($block && intval(get_config('system','block_public_blackout'))) + return $o; + if((! is_array($profile)) && (! count($profile))) return $o; @@ -935,6 +938,7 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) { $show_connect = false; + $profile['picdate'] = urlencode($profile['picdate']); call_hooks('profile_sidebar_enter', $profile); |