diff options
| author | Michael <icarus@dabo.de> | 2012-02-27 00:03:51 +0100 |
|---|---|---|
| committer | Michael <icarus@dabo.de> | 2012-02-27 00:03:51 +0100 |
| commit | 18679111f5aed8f1c5e7ccb9857195e52c57765d (patch) | |
| tree | bffb4a563ed2fe1ff02a4221e28c608460c866db /mod/profile.php | |
| parent | fe3dfbee5638dd2988bd8b126652b3138572f02c (diff) | |
| parent | 6ddd444afde33337235eab3aa9d6d1fe12bcb7a4 (diff) | |
| download | volse-hubzilla-18679111f5aed8f1c5e7ccb9857195e52c57765d.tar.gz volse-hubzilla-18679111f5aed8f1c5e7ccb9857195e52c57765d.tar.bz2 volse-hubzilla-18679111f5aed8f1c5e7ccb9857195e52c57765d.zip | |
Merge remote branch 'upstream/master'
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(); |