kill orphans

boot.php

@@ -2,8 +2,8 @@
 
 set_time_limit(0);
 
-define ( 'BUILD_ID',               1034   );
-define ( 'FRIENDIKA_VERSION',      '2.10.0904' );
+define ( 'BUILD_ID',               1035   );
+define ( 'FRIENDIKA_VERSION',      '2.10.0905' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.1'  );
 
 define ( 'EOL',                    "<br />\r\n"     );

include/items.php

@@ -144,7 +144,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
 		`contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, 
 		`contact`.`id` AS `contact-id`, `contact`.`uid` AS `contact-uid`
 		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-		WHERE `item`.`uid` = %d AND `item`.`visible` = 1 
+		WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`parent` != 0 
 		AND `item`.`wall` = 1 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
 		AND ( `item`.`edited` > '%s' OR `item`.`changed` > '%s' )
 		$sql_extra

update.php

@@ -328,3 +328,17 @@ function update_1033() {
  		`updated` DATETIME NOT NULL
 		) ENGINE = MYISAM DEFAULT CHARSET=utf8;");
 }
+
+
+function update_1034() {
+
+	// If you have any of these parent-less posts they can cause problems, and 
+	// we need to delete them. You can't see them anyway.
+	// Legitimate items will usually get re-created on the next 
+	// pull from the hub.
+	// But don't get rid of a post that may have just come in 
+	// and may not yet have the parent id set.
+
+	q("DELETE FROM `item` WHERE `parent` = 0 AND `created` < UTC_TIMESTAMP() - INTERVAL 2 MINUTE");
+
+}