This item removal is much more cleaner

diff --git a/include/expire.php b/include/expire.php
index da121157d21d5ed22454b33d4e76b26dea7d767e..73bffb20dce37a89e88714afdf7611634da2b8c4 100644 (file)
--- a/include/expire.php
+++ b/include/expire.php
@@ -10,8 +10,13 @@ function expire_run(&$argv, &$argc){
        require_once('include/Contact.php');
 
        // physically remove anything that has been deleted for more than two months
-
-       $r = q("DELETE FROM `item` WHERE `deleted` = 1 AND `changed` < UTC_TIMESTAMP() - INTERVAL 60 DAY");
+       $r = dba::p("SELECT `id` FROM `item` WHERE `deleted` AND `changed` < UTC_TIMESTAMP() - INTERVAL 60 DAY");
+       if (dbm::is_result($r)) {
+               while ($row = dba::fetch($r)) {
+                       dba::delete('item', array('id' => $row['id']));
+               }
+               dba::close($r);
+       }
 
        // make this optional as it could have a performance impact on large sites