clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2040 from annando/issue-2038 

Bugfix for non working pagination in GNU Social
This commit is contained in:
Tobias Diekershoff 2015-11-08 12:13:07 +01:00
parent e4b2ef84b1 27b166caf6
commit baf8eb5081
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/ostatus.php
View File

@ -48,7 +48,7 @@ function ostatus_follow_friends($uid, $url) {
$r = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND $r = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND
(`nurl` = '%s' OR `alias` = '%s' OR `alias` = '%s') AND (`nurl` = '%s' OR `alias` = '%s' OR `alias` = '%s') AND
`network` != '%s' LIMIT 1", `network` != '%s' LIMIT 1",
intval($uid), dbesc(normalise_link($url)), intval($uid), dbesc(normalise_link($url)),
dbesc(normalise_link($url)), dbesc($url), dbesc(NETWORK_STATUSNET)); dbesc(normalise_link($url)), dbesc($url), dbesc(NETWORK_STATUSNET));
if (!$r) { if (!$r) {
$data = probe_url($friend->statusnet_profile_url); $data = probe_url($friend->statusnet_profile_url);
@ -315,7 +315,7 @@ function ostatus_import($xml,$importer,&$contact, &$hub) {
$orig_uri = $xpath->query("activity:object/atom:id", $entry)->item(0)->nodeValue; $orig_uri = $xpath->query("activity:object/atom:id", $entry)->item(0)->nodeValue;
logger("Favorite ".$orig_uri." ".print_r($item, true)); logger("Favorite ".$orig_uri." ".print_r($item, true));
$item["verb"] = ACTIVITY_LIKE; $item["verb"] = ACTIVITY_LIKE;
$item["parent-uri"] = $orig_uri; $item["parent-uri"] = $orig_uri;
$item["gravity"] = GRAVITY_LIKE; $item["gravity"] = GRAVITY_LIKE;
} }
@ -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++;