harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into trinidad

Browse Source
This commit is contained in:
friendica 2015-01-06 15:45:00 -08:00
commit a1e5a661fa
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/zot.php
View File

@ -1542,15 +1542,20 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false,$reque
continue; continue;
} }
$r = q("select id, edited, item_flags, mid, parent_mid from item where mid = '%s' and uid = %d limit 1", $r = q("select id, edited, item_restrict, item_flags, mid, parent_mid from item where mid = '%s' and uid = %d limit 1",
dbesc($arr['mid']), dbesc($arr['mid']),
intval($channel['channel_id']) intval($channel['channel_id'])
); );
if($r) { if($r) {
// We already have this post. // We already have this post.
// Maybe it has been edited?
$item_id = $r[0]['id']; $item_id = $r[0]['id'];
if($arr['edited'] > $r[0]['edited']) { if($r[0]['item_restrict'] & ITEM_DELETED) {
// It was deleted locally.
$result[] = array($d['hash'],'update ignored',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']);
continue;
}
// Maybe it has been edited?
elseif($arr['edited'] > $r[0]['edited']) {
$arr['id'] = $r[0]['id']; $arr['id'] = $r[0]['id'];
$arr['uid'] = $channel['channel_id']; $arr['uid'] = $channel['channel_id'];
update_imported_item($sender,$arr,$channel['channel_id']); update_imported_item($sender,$arr,$channel['channel_id']);