diff options
| author | zotlabs <mike@macgirvin.com> | 2018-10-08 20:58:16 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-10-08 20:58:16 -0700 |
| commit | 2cb52f88755aac62f208463e4754153bbf249c67 (patch) | |
| tree | 01746da751c10a67f6064d2d1fd79af33dc73685 /Zotlabs/Module/Ping.php | |
| parent | 2c797807cd63850055fc65e445a605aee106530a (diff) | |
| parent | 37b94bf5fa71835fe50af6f862e124e24b5db4b4 (diff) | |
| download | volse-hubzilla-2cb52f88755aac62f208463e4754153bbf249c67.tar.gz volse-hubzilla-2cb52f88755aac62f208463e4754153bbf249c67.tar.bz2 volse-hubzilla-2cb52f88755aac62f208463e4754153bbf249c67.zip | |
Merge branch 'dev'
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(); |