diff options
| author | git-marijus <mario@mariovavti.com> | 2018-04-09 22:41:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-09 22:41:40 +0200 |
| commit | 482e26ae26b07a9444452dc41ad46bb4cbe08424 (patch) | |
| tree | 8538645fb78241d90c1653fee8ab41f4cb3b7c93 | |
| parent | 04935f139d924514b066a3cbe3a544102090de59 (diff) | |
| parent | c50105b8c155de6b2e3bf3fcfcc6697db9dbe8f4 (diff) | |
| download | volse-hubzilla-482e26ae26b07a9444452dc41ad46bb4cbe08424.tar.gz volse-hubzilla-482e26ae26b07a9444452dc41ad46bb4cbe08424.tar.bz2 volse-hubzilla-482e26ae26b07a9444452dc41ad46bb4cbe08424.zip | |
Merge pull request #1053 from jschweinsberg/fix/pubstream-notifications
Public stream notifications
| -rw-r--r-- | Zotlabs/Module/Settings/Channel.php | 5 | ||||
| -rw-r--r-- | Zotlabs/Widget/Notifications.php | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Zotlabs/Module/Settings/Channel.php b/Zotlabs/Module/Settings/Channel.php index a7dfdd790..48f3edb80 100644 --- a/Zotlabs/Module/Settings/Channel.php +++ b/Zotlabs/Module/Settings/Channel.php @@ -484,7 +484,8 @@ class Channel { $plugin = [ 'basic' => '', 'security' => '', 'notify' => '', 'misc' => '' ]; call_hooks('channel_settings',$plugin); - $disable_discover_tab = get_config('system','disable_discover_tab') || get_config('system','disable_discover_tab') === false; + $disable_discover_tab = intval(get_config('system','disable_discover_tab',1)) == 1; + $site_firehose = intval(get_config('system','site_firehose',0)) == 1; $o .= replace_macros($stpl,array( '$ptitle' => t('Channel Settings'), @@ -575,7 +576,7 @@ class Channel { '$vnotify10' => array('vnotify10', t('New connections'), ($vnotify & VNOTIFY_INTRO), VNOTIFY_INTRO, t('Recommended'), $yes_no), '$vnotify11' => ((is_site_admin()) ? array('vnotify11', t('System Registrations'), ($vnotify & VNOTIFY_REGISTER), VNOTIFY_REGISTER, '', $yes_no) : array()), '$vnotify12' => array('vnotify12', t('Unseen shared files'), ($vnotify & VNOTIFY_FILES), VNOTIFY_FILES, '', $yes_no), - '$vnotify13' => (($disable_discover_tab) ? array() : array('vnotify13', t('Unseen public activity'), ($vnotify & VNOTIFY_PUBS), VNOTIFY_PUBS, '', $yes_no)), + '$vnotify13' => (($disable_discover_tab && !$site_firehose) ? array() : array('vnotify13', t('Unseen public activity'), ($vnotify & VNOTIFY_PUBS), VNOTIFY_PUBS, '', $yes_no)), '$mailhost' => [ 'mailhost', t('Email notification hub (hostname)'), get_pconfig(local_channel(),'system','email_notify_host',\App::get_hostname()), sprintf( t('If your channel is mirrored to multiple hubs, set this to your preferred location. This will prevent duplicate email notifications. Example: %s'),\App::get_hostname()) ], '$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), diff --git a/Zotlabs/Widget/Notifications.php b/Zotlabs/Widget/Notifications.php index f2619c5cf..fc78a2a39 100644 --- a/Zotlabs/Widget/Notifications.php +++ b/Zotlabs/Widget/Notifications.php @@ -123,7 +123,7 @@ class Notifications { ]; } - if(get_config('system', 'disable_discover_tab') != 1) { + if(can_view_public_stream()) { $notifications[] = [ 'type' => 'pubs', 'icon' => 'globe', |