Remove global $db variable

[friendica.git] / src / Worker / Expire.php

diff --git a/src/Worker/Expire.php b/src/Worker/Expire.php
index b09db5c6774e171a774fd003479635b9945ef3f1..685fad49e8f64fc171946f3600203b26c5489d13 100644 (file)
--- a/src/Worker/Expire.php
+++ b/src/Worker/Expire.php
@@ -15,9 +15,11 @@ use dba;
 
 require_once 'include/dba.php';
 
-class Expire {
-       public static function execute($param = '', $hook_name = '') {
-               global $a;
+class Expire
+{
+       public static function execute($param = '', $hook_name = '')
+       {
+               $a = \Friendica\BaseObject::getApp();
 
                require_once 'include/items.php';
 
@@ -42,12 +44,12 @@ class Expire {
                        // Normally we shouldn't have orphaned data at all.
                        // If we do have some, then we have to check why.
                        logger('Deleting orphaned item activities - start', LOGGER_DEBUG);
-                       $condition = ["NOT EXISTS (SELECT `iaid` FROM `item` WHERE `item`.`uri` = `item-activity`.`uri`)"];
+                       $condition = ["NOT EXISTS (SELECT `iaid` FROM `item` WHERE `item`.`iaid` = `item-activity`.`id`)"];
                        dba::delete('item-activity', $condition);
                        logger('Orphaned item activities deleted: ' . dba::affected_rows(), LOGGER_DEBUG);
 
                        logger('Deleting orphaned item content - start', LOGGER_DEBUG);
-                       $condition = ["NOT EXISTS (SELECT `icid` FROM `item` WHERE `item`.`uri` = `item-content`.`uri`)"];
+                       $condition = ["NOT EXISTS (SELECT `icid` FROM `item` WHERE `item`.`icid` = `item-content`.`id`)"];
                        dba::delete('item-content', $condition);
                        logger('Orphaned item content deleted: ' . dba::affected_rows(), LOGGER_DEBUG);