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

move permission check before global block check

Browse Source
This commit is contained in:
redmatrix 2016-01-29 14:07:10 -08:00
parent c214692f66
commit 08aeeadd71
3 changed files with 650 additions and 648 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/identity.php
View File

@ -924,6 +924,10 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) {
$pdesc = true; $pdesc = true;
$reddress = true; $reddress = true;
if(! perm_is_allowed($profile['uid'],((is_array($observer)) ? $observer['xchan_hash'] : ''),'view_profile')) {
$block = true;
}
if($block && intval(get_config('system','block_public_blackout'))) if($block && intval(get_config('system','block_public_blackout')))
return $o; return $o;
@ -1012,9 +1016,6 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) {
// logger('online: ' . $profile['online']); // logger('online: ' . $profile['online']);
if(! perm_is_allowed($profile['uid'],((is_array($observer)) ? $observer['xchan_hash'] : ''),'view_profile')) {
$block = true;
}
if(($profile['hidewall'] && (! local_channel()) && (! remote_channel())) || $block ) { if(($profile['hidewall'] && (! local_channel()) && (! remote_channel())) || $block ) {
$location = $reddress = $pdesc = $gender = $marital = $homepage = False; $location = $reddress = $pdesc = $gender = $marital = $homepage = False;

1289
util/hmessages.po
View File

File diff suppressed because it is too large Load Diff

2
version.inc
View File

@ -1 +1 @@
2016-01-28.1292H 2016-01-29.1293H