X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fexpire.php;h=aa34cbaa5bf88b8c4af782e0680058c2a22df3b0;hb=0cd9db9cb7f4c96f597e37590a536eaae123238d;hp=35b109a50a487156ac53fe3d3ec66bfb1c9906e6;hpb=46c5b3b419bd3601d72b154e792cb2b2ad9477dc;p=friendica.git

diff --git a/include/expire.php b/include/expire.php
index 35b109a50a..aa34cbaa5b 100644
--- a/include/expire.php
+++ b/include/expire.php
@@ -1,6 +1,6 @@
 <?php
 
-use \Friendica\Core\Config;
+use Friendica\Core\Config;
 
 function expire_run(&$argv, &$argc){
 	global $a;
@@ -10,21 +10,26 @@ 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
-
-	if(intval(get_config('system','optimize_items')))
-		q("optimize table item");
+	if (intval(get_config('system', 'optimize_items'))) {
+		q("OPTIMIZE TABLE `item`");
+	}
 
 	logger('expire: start');
 
-	$r = q("SELECT `uid`,`username`,`expire` FROM `user` WHERE `expire` != 0");
+	$r = q("SELECT `uid`, `username`, `expire` FROM `user` WHERE `expire` != 0");
 	if (dbm::is_result($r)) {
 		foreach ($r as $rr) {
 			logger('Expire: ' . $rr['username'] . ' interval: ' . $rr['expire'], LOGGER_DEBUG);
-			item_expire($rr['uid'],$rr['expire']);
+			item_expire($rr['uid'], $rr['expire']);
 		}
 	}