harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of ../hz into dev

Browse Source
This commit is contained in:
zotlabs 2019-03-31 16:23:04 -07:00
commit a1bea7d7cc
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Item.php
View File

@ -166,7 +166,7 @@ class Item extends Controller {
if(! perm_is_allowed($chan['channel_id'],get_observer_hash(),'view_stream')) if(! perm_is_allowed($chan['channel_id'],get_observer_hash(),'view_stream'))
http_status_exit(403, 'Forbidden'); 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) { if($portable_id) {
ThreadListener::store(z_root() . '/item/' . $item_id,$portable_id); ThreadListener::store(z_root() . '/item/' . $item_id,$portable_id);
} }

6
Zotlabs/Widget/Suggestions.php
View File

@ -2,6 +2,8 @@
namespace Zotlabs\Widget; namespace Zotlabs\Widget;
use Zotlabs\Lib\Apps;
require_once('include/socgraph.php'); require_once('include/socgraph.php');
@ -9,9 +11,9 @@ class Suggestions {
function widget($arr) { 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); $r = suggestion_query(local_channel(),get_observer_hash(),0,20);