Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-21 08:35:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of /home/macgirvin/roadhouse into dev

Browse source
This commit is contained in:
nobody 2021-04-19 18:05:11 -07:00
commit 34773093d4
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Zotlabs/Module/Item.php
View file

@ -234,7 +234,7 @@ class Item extends Controller {
http_status_exit(403, 'Forbidden');
}
$i = Activity::encode_item_collection($items,'conversation/' . $item_id,'OrderedCollection',true, count($nitems));
$i = Activity::encode_item_collection($items,'conversation/' . $item_id,'OrderedCollection',true, count($items));
if ($portable_id && (! intval($items[0]['item_private']))) {
ThreadListener::store(z_root() . '/item/' . $item_id,$portable_id);
}

3
Zotlabs/Module/Pubstream.php
View file

@ -154,7 +154,8 @@ class Pubstream extends Controller {
$pager_sql = '';
}
else {
App::set_pager_itemspage(20);
$itemspage = ((local_channel()) ? get_pconfig(local_channel(),'system','itemspage', 20) : 20);
App::set_pager_itemspage($itemspage);
$pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start']));
}