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/Ping.php | |
| 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/Ping.php')
| -rw-r--r-- | Zotlabs/Module/Ping.php | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php index baefe62ec..14627f56e 100644 --- a/Zotlabs/Module/Ping.php +++ b/Zotlabs/Module/Ping.php @@ -2,6 +2,8 @@ namespace Zotlabs\Module; +use Zotlabs\Lib\Apps; + require_once('include/bbcode.php'); /** @@ -147,9 +149,12 @@ class Ping extends \Zotlabs\Web\Controller { if(! ($vnotify & VNOTIFY_LIKE)) $sql_extra = " AND verb NOT IN ('" . dbesc(ACTIVITY_LIKE) . "', '" . dbesc(ACTIVITY_DISLIKE) . "') "; - $discover_tab_on = can_view_public_stream(); - - $notify_pubs = ((local_channel()) ? ($vnotify & VNOTIFY_PUBS) && $discover_tab_on : $discover_tab_on); + if(local_channel()) { + $notify_pubs = ($vnotify & VNOTIFY_PUBS) && can_view_public_stream() && Apps::system_app_installed(local_channel(), 'Public Stream'); + } + else { + $notify_pubs = can_view_public_stream(); + } if($notify_pubs) { $sys = get_sys_channel(); |