mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-19 23:55:19 +00:00
move permission check before global block check
This commit is contained in:
parent
c214692f66
commit
08aeeadd71
3 changed files with 650 additions and 648 deletions
|
@ -924,6 +924,10 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) {
|
|||
$pdesc = 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')))
|
||||
return $o;
|
||||
|
||||
|
@ -1012,9 +1016,6 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) {
|
|||
|
||||
// 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 ) {
|
||||
$location = $reddress = $pdesc = $gender = $marital = $homepage = False;
|
||||
|
|
1289
util/hmessages.po
1289
util/hmessages.po
File diff suppressed because it is too large
Load diff
|
@ -1 +1 @@
|
|||
2016-01-28.1292H
|
||||
2016-01-29.1293H
|
||||
|
|
Loading…
Reference in a new issue