From dc4a4ca9d3f170ee74716702c4039f2d49af42e5 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 21 Mar 2019 18:00:33 -0700 Subject: nomadic is not a parameter in the hz version of encode_item_collection --- Zotlabs/Module/Item.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); } -- cgit v1.2.3 From b2bdc73164f7ede118febf823f729e57e7f4950f Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 31 Mar 2019 16:22:02 -0700 Subject: suggestion widget using feature_enabled still - upgrade to use apps. --- Zotlabs/Widget/Suggestions.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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); -- cgit v1.2.3