harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Haakon Meland Eriksen 2016-01-28 18:28:04 +01:00
commit 9abff11f86
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/identity.php
View File

@ -924,6 +924,9 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) {
$pdesc = true; $pdesc = true;
$reddress = true; $reddress = true;
if($block && intval(get_config('system','block_public_blackout')))
return $o;
if((! is_array($profile)) && (! count($profile))) if((! is_array($profile)) && (! count($profile)))
return $o; return $o;
@ -935,6 +938,7 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) {
$show_connect = false; $show_connect = false;
$profile['picdate'] = urlencode($profile['picdate']); $profile['picdate'] = urlencode($profile['picdate']);
call_hooks('profile_sidebar_enter', $profile); call_hooks('profile_sidebar_enter', $profile);