aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-02-06 02:33:02 -0800
committerFriendika <info@friendika.com>2011-02-06 02:33:02 -0800
commitac3f3a6e9fb46ab608f26d4dfc12ee631e0e453a (patch)
treedf973a35f447f004d914cc452c6b94ccd84f910e
parent073f3720ac3132b950fc0aec6470feb99c5e8b92 (diff)
downloadvolse-hubzilla-ac3f3a6e9fb46ab608f26d4dfc12ee631e0e453a.tar.gz
volse-hubzilla-ac3f3a6e9fb46ab608f26d4dfc12ee631e0e453a.tar.bz2
volse-hubzilla-ac3f3a6e9fb46ab608f26d4dfc12ee631e0e453a.zip
kill orphans
-rw-r--r--boot.php4
-rw-r--r--include/items.php2
-rw-r--r--update.php14
3 files changed, 17 insertions, 3 deletions
diff --git a/boot.php b/boot.php
index 4fc05f81a..4fc35be9b 100644
--- a/boot.php
+++ b/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" );
diff --git a/include/items.php b/include/items.php
index 359378ff7..15fd262f4 100644
--- a/include/items.php
+++ b/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
diff --git a/update.php b/update.php
index f7bf9da1e..f90983747 100644
--- a/update.php
+++ b/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");
+
+}