From 9a1e5aaf09c1b940f4615f7dc2999e16b019ab18 Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 8 Feb 2011 05:08:10 -0800 Subject: [PATCH] tweaks to reworked remote deletion, which also fixes some comment box oddities --- include/items.php | 4 ++-- mod/dfrn_notify.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/items.php b/include/items.php index 5185e74dc..cffd13a01 100644 --- a/include/items.php +++ b/include/items.php @@ -1058,7 +1058,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0) { $item = $r[0]; if(! $item['deleted']) - logger('dfrn_notify: deleting item ' . $item['id'] . ' uri=' . $item['uri'], LOGGER_DEBUG); + logger('consume_feed: deleting item ' . $item['id'] . ' uri=' . $item['uri'], LOGGER_DEBUG); if($item['uri'] == $item['parent-uri']) { $r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s', @@ -1081,7 +1081,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0) { ); if($item['last-child']) { // ensure that last-child is set in case the comment that had it just got wiped. - $q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d ", + q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d ", dbesc(datetime_convert()), dbesc($item['parent-uri']), intval($item['uid']) diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index cd0f58753..dffbb5974 100644 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.php @@ -246,7 +246,7 @@ function dfrn_notify_post(&$a) { ); if($item['last-child']) { // ensure that last-child is set in case the comment that had it just got wiped. - $q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d ", + q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d ", dbesc(datetime_convert()), dbesc($item['parent-uri']), intval($item['uid'])