aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Settings/Permcats.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-03-19 13:33:45 +0100
committerMario Vavti <mario@mariovavti.com>2017-03-19 13:33:45 +0100
commit0938db8f7b565e65248411a3eb3039481247f3f5 (patch)
treea791dda7c11d9fc015a82f2057ba984c548e1bef /Zotlabs/Module/Settings/Permcats.php
parent57584ea4295df83f3dfd57d99917178ecf2e250f (diff)
parentd2c971eda99fadb7515fb1e1ea4bd645a52513bd (diff)
downloadvolse-hubzilla-0938db8f7b565e65248411a3eb3039481247f3f5.tar.gz
volse-hubzilla-0938db8f7b565e65248411a3eb3039481247f3f5.tar.bz2
volse-hubzilla-0938db8f7b565e65248411a3eb3039481247f3f5.zip
Merge branch 'dev' into bs4
Diffstat (limited to 'Zotlabs/Module/Settings/Permcats.php')
-rw-r--r--Zotlabs/Module/Settings/Permcats.php4
1 files changed, 1 insertions, 3 deletions
diff --git a/Zotlabs/Module/Settings/Permcats.php b/Zotlabs/Module/Settings/Permcats.php
index 90dc526bf..336f69653 100644
--- a/Zotlabs/Module/Settings/Permcats.php
+++ b/Zotlabs/Module/Settings/Permcats.php
@@ -42,8 +42,6 @@ class Permcats {
function get() {
-logger('cmd: ' . \App::$cmd);
-
if(! local_channel())
return;
@@ -85,7 +83,7 @@ logger('cmd: ' . \App::$cmd);
if($existing[$k])
$thisperm = "1";
- $perms[] = array('perms_' . $k, $v, ((array_key_exists($k,$their_perms)) ? intval($their_perms[$k]) : ''),$thisperm, 1, (($checkinherited & PERMS_SPECIFIC) ? '' : '1'), '', $checkinherited);
+ $perms[] = array('perms_' . $k, $v, '',$thisperm, 1, (($checkinherited & PERMS_SPECIFIC) ? '' : '1'), '', $checkinherited);
}