EntropyEngineer/friendica-addons
0
0
Fork 0
forked from friendica/friendica-addons
Code Pull requests Activity

Merge remote-tracking branch 'upstream/master' into 1612-twitter-video

Browse source
This commit is contained in:
Michael 2016-12-10 11:21:55 +00:00
parent c0edd9eca8 0124bd51ee
commit ae95b93de3
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pumpio/pumpio.php
View file

@ -775,6 +775,10 @@ function pumpio_fetchtimeline(&$a, $uid) {
$_REQUEST["profile_uid"] = $uid; $_REQUEST["profile_uid"] = $uid;
$_REQUEST["source"] = "pump.io"; $_REQUEST["source"] = "pump.io";
if (isset($post->object->id)) {
$_REQUEST['message_id'] = NETWORK_PUMPIO.":".$post->object->id;
}
if ($post->object->displayName != "") if ($post->object->displayName != "")
$_REQUEST["title"] = html2bbcode($post->object->displayName); $_REQUEST["title"] = html2bbcode($post->object->displayName);
else else
@ -1352,9 +1356,10 @@ function pumpio_fetchinbox(&$a, $uid) {
$self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1", $self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
intval($uid)); intval($uid));
$lastitems = q("SELECT uri FROM `item` WHERE `network` = '%s' AND `uid` = %d AND $lastitems = q("SELECT `uri` FROM `thread`
`extid` != '' AND `id` = `parent` INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
ORDER BY `commented` DESC LIMIT 10", WHERE `thread`.`network` = '%s' AND `thread`.`uid` = %d AND `item`.`extid` != ''
ORDER BY `thread`.`commented` DESC LIMIT 10",
dbesc(NETWORK_PUMPIO), dbesc(NETWORK_PUMPIO),
intval($uid) intval($uid)
); );