|
|
@ -1582,9 +1582,10 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) |
|
|
|
|
|
|
|
if(count($r)) { |
|
|
|
if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) { |
|
|
|
$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", |
|
|
|
$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", |
|
|
|
dbesc($datarray['title']), |
|
|
|
dbesc($datarray['body']), |
|
|
|
dbesc($datarray['tag']), |
|
|
|
dbesc(datetime_convert('UTC','UTC',$datarray['edited'])), |
|
|
|
dbesc($item_id), |
|
|
|
intval($importer['uid']) |
|
|
@ -1727,9 +1728,10 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) |
|
|
|
|
|
|
|
if(count($r)) { |
|
|
|
if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) { |
|
|
|
$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", |
|
|
|
$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", |
|
|
|
dbesc($datarray['title']), |
|
|
|
dbesc($datarray['body']), |
|
|
|
dbesc($datarray['tag']), |
|
|
|
dbesc(datetime_convert('UTC','UTC',$datarray['edited'])), |
|
|
|
dbesc($item_id), |
|
|
|
intval($importer['uid']) |
|
|
@ -1800,7 +1802,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) |
|
|
|
// but otherwise there's a possible data mixup on the sender's system.
|
|
|
|
// the tgroup delivery code called from item_store will correct it if it's a forum,
|
|
|
|
// but we're going to unconditionally correct it here so that the post will always be owned by our contact.
|
|
|
|
logger('local_delivery: Correcting item owner.', LOGGER_DEBUG); |
|
|
|
logger('consume_feed: Correcting item owner.', LOGGER_DEBUG); |
|
|
|
$datarray['owner-name'] = $contact['name']; |
|
|
|
$datarray['owner-link'] = $contact['url']; |
|
|
|
$datarray['owner-avatar'] = $contact['thumb']; |
|
|
@ -2332,9 +2334,10 @@ function local_delivery($importer,$data) { |
|
|
|
|
|
|
|
if(count($r)) { |
|
|
|
if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) { |
|
|
|
$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", |
|
|
|
$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", |
|
|
|
dbesc($datarray['title']), |
|
|
|
dbesc($datarray['body']), |
|
|
|
dbesc($datarray['tag']), |
|
|
|
dbesc(datetime_convert('UTC','UTC',$datarray['edited'])), |
|
|
|
dbesc($item_id), |
|
|
|
intval($importer['importer_uid']) |
|
|
@ -2497,9 +2500,10 @@ function local_delivery($importer,$data) { |
|
|
|
|
|
|
|
if(count($r)) { |
|
|
|
if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) { |
|
|
|
$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", |
|
|
|
$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", |
|
|
|
dbesc($datarray['title']), |
|
|
|
dbesc($datarray['body']), |
|
|
|
dbesc($datarray['tag']), |
|
|
|
dbesc(datetime_convert('UTC','UTC',$datarray['edited'])), |
|
|
|
dbesc($item_id), |
|
|
|
intval($importer['importer_uid']) |
|
|
|