diff options
| author | Mario <mario@mariovavti.com> | 2019-04-01 12:42:07 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2019-04-01 12:42:07 +0200 |
| commit | 2bdcd436bb3b8ed3090a500550bf93d30d15aa7f (patch) | |
| tree | 44182c8a92515986e2ca704ba4c4bb2d4e1be96a /Zotlabs/Module | |
| parent | b384b275466655659c063253e82962c3fe524f6f (diff) | |
| parent | a1bea7d7cc33cfaec3114e7cb97093ec647a026a (diff) | |
| download | volse-hubzilla-2bdcd436bb3b8ed3090a500550bf93d30d15aa7f.tar.gz volse-hubzilla-2bdcd436bb3b8ed3090a500550bf93d30d15aa7f.tar.bz2 volse-hubzilla-2bdcd436bb3b8ed3090a500550bf93d30d15aa7f.zip | |
Merge branch 'dev' into 'dev'
check service class limits when syncing files
See merge request hubzilla/core!1578
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Item.php | 2 |
1 files changed, 1 insertions, 1 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); } |