diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-03-19 13:33:45 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-03-19 13:33:45 +0100 |
| commit | 0938db8f7b565e65248411a3eb3039481247f3f5 (patch) | |
| tree | a791dda7c11d9fc015a82f2057ba984c548e1bef /Zotlabs | |
| parent | 57584ea4295df83f3dfd57d99917178ecf2e250f (diff) | |
| parent | d2c971eda99fadb7515fb1e1ea4bd645a52513bd (diff) | |
| download | volse-hubzilla-0938db8f7b565e65248411a3eb3039481247f3f5.tar.gz volse-hubzilla-0938db8f7b565e65248411a3eb3039481247f3f5.tar.bz2 volse-hubzilla-0938db8f7b565e65248411a3eb3039481247f3f5.zip | |
Merge branch 'dev' into bs4
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Settings/Channel.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Settings/Permcats.php | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/Zotlabs/Module/Settings/Channel.php b/Zotlabs/Module/Settings/Channel.php index 8eb3b2181..56a7d0d8e 100644 --- a/Zotlabs/Module/Settings/Channel.php +++ b/Zotlabs/Module/Settings/Channel.php @@ -575,7 +575,7 @@ class Channel { '$removeme' => t('Remove Channel'), '$removechannel' => t('Remove this channel.'), '$firefoxshare' => t('Firefox Share $Projectname provider'), - '$cal_first_day' => array('first_day', t('Start calendar week on monday'), ((get_pconfig(local_channel(),'system','cal_first_day')) ? 1 : ''), '', $yes_no), + '$cal_first_day' => array('first_day', t('Start calendar week on Monday'), ((get_pconfig(local_channel(),'system','cal_first_day')) ? 1 : ''), '', $yes_no), )); call_hooks('settings_form',$o); 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); } |