Merge pull request #2040 from annando/issue-2038
Bugfix for non working pagination in GNU Social
This commit is contained in:
commit
baf8eb5081
|
@ -702,9 +702,13 @@ function ostatus_completion($conversation_url, $uid, $item = array()) {
|
||||||
$conv_as = str_replace(',"statusnet:notice_info":', ',"statusnet_notice_info":', $conv_as);
|
$conv_as = str_replace(',"statusnet:notice_info":', ',"statusnet_notice_info":', $conv_as);
|
||||||
$conv_as = json_decode($conv_as);
|
$conv_as = json_decode($conv_as);
|
||||||
|
|
||||||
|
$no_of_items = sizeof($items);
|
||||||
|
|
||||||
if (@is_array($conv_as->items))
|
if (@is_array($conv_as->items))
|
||||||
$items = array_merge($items, $conv_as->items);
|
foreach ($conv_as->items AS $item)
|
||||||
else
|
$items[$item->id] = $item;
|
||||||
|
|
||||||
|
if ($no_of_items == sizeof($items))
|
||||||
break;
|
break;
|
||||||
|
|
||||||
$pageno++;
|
$pageno++;
|
||||||
|
|
Loading…
Reference in a new issue