diff options
| author | zotlabs <mike@macgirvin.com> | 2017-10-05 19:24:16 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-10-05 19:24:16 -0700 |
| commit | d70e6f273b8b00f0aa1f0c38082403bdced38cd2 (patch) | |
| tree | fdc5095304db00fa105333d81430b09d913ea0d2 /Zotlabs | |
| parent | 7c501ef60fd3d14e7184bf82d3ef6663401dcaea (diff) | |
| parent | 0ddc3e4af2fe70159b36f86cb367d1a24ec6ac71 (diff) | |
| download | volse-hubzilla-d70e6f273b8b00f0aa1f0c38082403bdced38cd2.tar.gz volse-hubzilla-d70e6f273b8b00f0aa1f0c38082403bdced38cd2.tar.bz2 volse-hubzilla-d70e6f273b8b00f0aa1f0c38082403bdced38cd2.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Settings/Channel.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Settings/Channel.php b/Zotlabs/Module/Settings/Channel.php index e49c34666..41e23b717 100644 --- a/Zotlabs/Module/Settings/Channel.php +++ b/Zotlabs/Module/Settings/Channel.php @@ -201,7 +201,7 @@ class Channel { $vnotify += intval($_POST['vnotify11']); if(x($_POST,'vnotify12')) $vnotify += intval($_POST['vnotify12']); - if(x($_POST,'vnotify13') && ! get_config('system', 'disable_discover_tab')) + if(x($_POST,'vnotify13') && (get_config('system', 'disable_discover_tab') != 1)) $vnotify += intval($_POST['vnotify13']); $always_show_in_notices = x($_POST,'always_show_in_notices') ? 1 : 0; @@ -560,7 +560,7 @@ class Channel { '$vnotify10' => array('vnotify10', t('New connections'), ($vnotify & VNOTIFY_INTRO), VNOTIFY_INTRO, t('Recommended'), $yes_no), '$vnotify11' => array('vnotify11', t('System Registrations'), ($vnotify & VNOTIFY_REGISTER), VNOTIFY_REGISTER, '', $yes_no), '$vnotify12' => array('vnotify12', t('Unseen shared files'), ($vnotify & VNOTIFY_FILES), VNOTIFY_FILES, '', $yes_no), - '$vnotify13' => ((!get_config('system', 'disable_discover_tab')) ? array() : array('vnotify13', t('Unseen public activity'), ($vnotify & VNOTIFY_PUBS), VNOTIFY_PUBS, '', $yes_no)), + '$vnotify13' => ((get_config('system', 'disable_discover_tab') != 1) ? array('vnotify13', t('Unseen public activity'), ($vnotify & VNOTIFY_PUBS), VNOTIFY_PUBS, '', $yes_no) : array()), '$always_show_in_notices' => array('always_show_in_notices', t('Also show new wall posts, private messages and connections under Notices'), $always_show_in_notices, 1, '', $yes_no), '$evdays' => array('evdays', t('Notify me of events this many days in advance'), $evdays, t('Must be greater than 0')), |