diff options
| author | zotlabs <mike@macgirvin.com> | 2019-03-31 16:23:04 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2019-03-31 16:23:04 -0700 |
| commit | a1bea7d7cc33cfaec3114e7cb97093ec647a026a (patch) | |
| tree | 21a29a1a1f44042062af697b0ca0d4f12ced7dba /Zotlabs | |
| parent | cbaf0a386435ae09d16efe3b36dbbfc52793adb6 (diff) | |
| parent | b2bdc73164f7ede118febf823f729e57e7f4950f (diff) | |
| download | volse-hubzilla-a1bea7d7cc33cfaec3114e7cb97093ec647a026a.tar.gz volse-hubzilla-a1bea7d7cc33cfaec3114e7cb97093ec647a026a.tar.bz2 volse-hubzilla-a1bea7d7cc33cfaec3114e7cb97093ec647a026a.zip | |
Merge branch 'dev' of ../hz into dev
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Item.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Widget/Suggestions.php | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index c466e7c82..6bc8c645f 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -166,7 +166,7 @@ class Item extends Controller { if(! perm_is_allowed($chan['channel_id'],get_observer_hash(),'view_stream')) http_status_exit(403, 'Forbidden'); - $i = Activity::encode_item_collection($nitems,'conversation/' . $item_id,'OrderedCollection',( defined('NOMADIC') ? false : true)); + $i = Activity::encode_item_collection($nitems,'conversation/' . $item_id,'OrderedCollection'); if($portable_id) { ThreadListener::store(z_root() . '/item/' . $item_id,$portable_id); } diff --git a/Zotlabs/Widget/Suggestions.php b/Zotlabs/Widget/Suggestions.php index 5fb3d3e8b..b4f384e9d 100644 --- a/Zotlabs/Widget/Suggestions.php +++ b/Zotlabs/Widget/Suggestions.php @@ -2,6 +2,8 @@ namespace Zotlabs\Widget; +use Zotlabs\Lib\Apps; + require_once('include/socgraph.php'); @@ -9,9 +11,9 @@ class Suggestions { function widget($arr) { - if((! local_channel()) || (! feature_enabled(local_channel(),'suggest'))) - return ''; + if((! local_channel()) || (! Apps::system_app_installed(local_channel(), 'Suggest Channels'))) + return EMPTY_STR; $r = suggestion_query(local_channel(),get_observer_hash(),0,20); |