diff options
| author | sirius <sirius83@gmx.de> | 2014-04-16 00:40:01 +0200 |
|---|---|---|
| committer | sirius <sirius83@gmx.de> | 2014-04-16 00:40:01 +0200 |
| commit | b0dc9f13edcbb705e1aa7d0af33bf0351f4d81f4 (patch) | |
| tree | 32b053e3f2c95740e316e898d6a2e15688aa4d02 /mod/profile.php | |
| parent | 8b8feea12f886a22f7eb66456be7828b7aef455e (diff) | |
| parent | efe80bb8e98b32b95d1380633e9ffd834fa82511 (diff) | |
| download | volse-hubzilla-b0dc9f13edcbb705e1aa7d0af33bf0351f4d81f4.tar.gz volse-hubzilla-b0dc9f13edcbb705e1aa7d0af33bf0351f4d81f4.tar.bz2 volse-hubzilla-b0dc9f13edcbb705e1aa7d0af33bf0351f4d81f4.zip | |
Merging in conflict
Diffstat (limited to 'mod/profile.php')
| -rw-r--r-- | mod/profile.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mod/profile.php b/mod/profile.php index fca7c8f9f..792bf34c5 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -61,7 +61,7 @@ function profile_content(&$a, $update = 0) { $o = ''; if(! (perm_is_allowed($a->profile['profile_uid'],get_observer_hash(), 'view_profile'))) { - notice( t('Access to this profile has been restricted.') . EOL); + notice( t('Permission denied.') . EOL); return; } @@ -69,11 +69,10 @@ 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_user())) { - notice( t('Access to this profile has been restricted.') . EOL); + notice( t('Permission denied.') . EOL); return; } - $o .= profile_tabs($a, $is_owner, $a->profile['channel_address']); |