diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-10-06 14:08:15 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2018-10-06 16:09:05 +0200 |
| commit | 98ee99071cf5556a323ae7f7bffd341fc03f7a6d (patch) | |
| tree | 287932ed3eaa721363974fddbe27ba4227dffc41 /Zotlabs/Module/Settings | |
| parent | 97acfd23fb3cfaba4ce388a5b21b98d136282ba6 (diff) | |
| download | volse-hubzilla-98ee99071cf5556a323ae7f7bffd341fc03f7a6d.tar.gz volse-hubzilla-98ee99071cf5556a323ae7f7bffd341fc03f7a6d.tar.bz2 volse-hubzilla-98ee99071cf5556a323ae7f7bffd341fc03f7a6d.zip | |
pubstream app
(cherry picked from commit b8991750c5d36714100d20595da6a33149bd7d5d)
Diffstat (limited to 'Zotlabs/Module/Settings')
| -rw-r--r-- | Zotlabs/Module/Settings/Channel.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Settings/Channel.php b/Zotlabs/Module/Settings/Channel.php index 6b49f165d..ebc444178 100644 --- a/Zotlabs/Module/Settings/Channel.php +++ b/Zotlabs/Module/Settings/Channel.php @@ -594,7 +594,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 && !$site_firehose) ? array() : array('vnotify13', t('Unseen public activity'), ($vnotify & VNOTIFY_PUBS), VNOTIFY_PUBS, '', $yes_no)), + '$vnotify13' => ((($disable_discover_tab && !$site_firehose) || !Apps::system_app_installed(local_channel(), 'Public Stream')) ? array() : array('vnotify13', t('Unseen public stream activity'), ($vnotify & VNOTIFY_PUBS), VNOTIFY_PUBS, '', $yes_no)), '$vnotify14' => array('vnotify14', t('Unseen likes and dislikes'), ($vnotify & VNOTIFY_LIKE), VNOTIFY_LIKE, '', $yes_no), '$vnotify15' => array('vnotify15', t('Unseen forum posts'), ($vnotify & VNOTIFY_FORUMS), VNOTIFY_FORUMS, '', $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()) ], |