diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2012-02-29 14:58:37 +0100 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2012-02-29 14:58:37 +0100 |
| commit | b71a3af4570ccf349804b9ffa151fc1d35287d88 (patch) | |
| tree | 264c012a0c8ca28c4035666d35c547a829968a2a /mod/profile.php | |
| parent | f5b8654818e63a0583e58caecc8a13c2d83c12d5 (diff) | |
| parent | fb33b4f2bcd18e63d311e6dba3aaa2ea5efdec3b (diff) | |
| download | volse-hubzilla-b71a3af4570ccf349804b9ffa151fc1d35287d88.tar.gz volse-hubzilla-b71a3af4570ccf349804b9ffa151fc1d35287d88.tar.bz2 volse-hubzilla-b71a3af4570ccf349804b9ffa151fc1d35287d88.zip | |
Merge remote-tracking branch 'friendica/master' into randomerror
Diffstat (limited to 'mod/profile.php')
| -rwxr-xr-x | mod/profile.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mod/profile.php b/mod/profile.php index eba9874a8..74e1a2302 100755 --- a/mod/profile.php +++ b/mod/profile.php @@ -107,7 +107,7 @@ function profile_content(&$a, $update = 0) { $is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false); - if($a->profile['hidewall'] && (! $is_owner) && (! $remote_contact)) { + if($a->user['hidewall'] && (! $is_owner) && (! $remote_contact)) { notice( t('Access to this profile has been restricted.') . EOL); return; } @@ -228,10 +228,12 @@ function profile_content(&$a, $update = 0) { intval($a->profile['profile_uid']), dbesc($parents_str) ); + + $items = conv_sort($items,'created'); + } else { + $items = array(); } - $items = conv_sort($items,'created'); - if($is_owner && ! $update) { $o .= get_birthdays(); $o .= get_events(); |