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

Merge pull request #675 from zzottel/master

Browse Source 
don't overwrite $x (contains import_xchan result) with role permissions
This commit is contained in:
RedMatrix 2014-11-07 06:39:11 +11:00
commit 91d255a056
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/zot.php
View File

@ -441,9 +441,9 @@ function zot_refresh($them,$channel = null, $force = false) {
else { else {
$role = get_pconfig($channel['channel_id'],'system','permissions_role'); $role = get_pconfig($channel['channel_id'],'system','permissions_role');
if($role) { if($role) {
$x = get_role_perms($role); $xx = get_role_perms($role);
if($x['perms_auto']) if($xx['perms_auto'])
$default_perms = $x['perms_accept']; $default_perms = $xx['perms_accept'];
} }
if(! $default_perms) if(! $default_perms)
$default_perms = intval(get_pconfig($channel['channel_id'],'system','autoperms')); $default_perms = intval(get_pconfig($channel['channel_id'],'system','autoperms'));