Merge branch 'dev'

1 files changed, 14 insertions, 0 deletions

diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php
index 19cb72b5b..94df29984 100644
--- a/Zotlabs/Module/Pubstream.php
+++ b/Zotlabs/Module/Pubstream.php
@@ -1,6 +1,9 @@
 <?php
 namespace Zotlabs\Module;
 
+use App;
+use Zotlabs\Lib\Apps;
+
 require_once('include/conversation.php');
 require_once('include/acl_selectors.php');
 
@@ -9,6 +12,17 @@ class Pubstream extends \Zotlabs\Web\Controller {
 
 	function get($update = 0, $load = false) {
 
+		if(local_channel()) {
+			if(! Apps::system_app_installed(local_channel(), 'Public Stream')) {
+				//Do not display any associated widgets at this point
+				App::$pdl = '';
+
+				$o = '<b>' . t('Public Stream App') . ' (' . t('Not Installed') . '):</b><br>';
+				$o .= t('The unmoderated public stream of this hub');
+				return $o;
+			}
+		}
+
 		if($load)
 			$_SESSION['loadtime'] = datetime_convert();