Merge pull request #5294 from annando/use-gravity

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

diff --git a/src/Worker/Expire.php b/src/Worker/Expire.php
index 6b853bde7722742427bf5967fe608ea7352819bf..713bfa25e0ad67f6a6f9caab456ba5de7375dffd 100644 (file)
--- a/src/Worker/Expire.php
+++ b/src/Worker/Expire.php
@@ -10,6 +10,7 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
+use Friendica\Model\Item;
 use dba;
 
 require_once 'include/dba.php';
@@ -18,7 +19,6 @@ class Expire {
        public static function execute($param = '', $hook_name = '') {
                global $a;
 
-               require_once 'include/datetime.php';
                require_once 'include/items.php';
 
                Addon::loadHooks();
@@ -26,9 +26,12 @@ class Expire {
                if ($param == 'delete') {
                        logger('Delete expired items', LOGGER_DEBUG);
                        // physically remove anything that has been deleted for more than two months
-                       $r = dba::p("SELECT `id` FROM `item` WHERE `deleted` AND `changed` < UTC_TIMESTAMP() - INTERVAL 60 DAY");
+                       $r = dba::p("SELECT `id`, `icid` FROM `item` WHERE `deleted` AND `changed` < UTC_TIMESTAMP() - INTERVAL 60 DAY");
                        while ($row = dba::fetch($r)) {
                                dba::delete('item', ['id' => $row['id']]);
+                               if (!dba::exists('item', ['icid' => $row['icid']])) {
+                                       dba::delete('item-content', ['id' => $row['icid']]);
+                               }
                        }
                        dba::close($r);
 
@@ -43,7 +46,7 @@ class Expire {
                        $user = dba::selectFirst('user', ['uid', 'username', 'expire'], ['uid' => $param]);
                        if (DBM::is_result($user)) {
                                logger('Expire items for user '.$user['uid'].' ('.$user['username'].') - interval: '.$user['expire'], LOGGER_DEBUG);
-                               item_expire($user['uid'], $user['expire']);
+                               Item::expire($user['uid'], $user['expire']);
                                logger('Expire items for user '.$user['uid'].' ('.$user['username'].') - done ', LOGGER_DEBUG);
                        }
                        return;