tweaks to reworked remote deletion, which also fixes some comment box oddities

diff --git a/include/items.php b/include/items.php
index 5185e74dc9c4a29dfdc6c49226a1d1b7cb632a73..cffd13a01e16679e6a9af92d432ebc22d8758f8c 100644 (file)
--- 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 cd0f587535e0f060e956c6f2f88798d9b4ab958e..dffbb597404a544090a226b2388b506d0588d0fb 100644 (file)
--- 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'])