aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRedMatrix <info@friendica.com>2014-11-07 06:39:11 +1100
committerRedMatrix <info@friendica.com>2014-11-07 06:39:11 +1100
commit91d255a0560552fee9adb9c8b957a4720b8c1837 (patch)
tree76ea4f4cd19d117dc879b7c012b82d26bdfbb01e /include
parent5e7e8d1089e6249093cb6758ecf9384465640b33 (diff)
parent1f35d9432ff6391c183fe9e268cbf3b76ac8dd0d (diff)
downloadvolse-hubzilla-91d255a0560552fee9adb9c8b957a4720b8c1837.tar.gz
volse-hubzilla-91d255a0560552fee9adb9c8b957a4720b8c1837.tar.bz2
volse-hubzilla-91d255a0560552fee9adb9c8b957a4720b8c1837.zip
Merge pull request #675 from zzottel/master
don't overwrite $x (contains import_xchan result) with role permissions
Diffstat (limited to 'include')
-rw-r--r--include/zot.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/zot.php b/include/zot.php
index 9f22bc30b..bdc1f607f 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -441,9 +441,9 @@ function zot_refresh($them,$channel = null, $force = false) {
else {
$role = get_pconfig($channel['channel_id'],'system','permissions_role');
if($role) {
- $x = get_role_perms($role);
- if($x['perms_auto'])
- $default_perms = $x['perms_accept'];
+ $xx = get_role_perms($role);
+ if($xx['perms_auto'])
+ $default_perms = $xx['perms_accept'];
}
if(! $default_perms)
$default_perms = intval(get_pconfig($channel['channel_id'],'system','autoperms'));