Improve expire for item-content and item-activity

diff --git a/src/Model/Item.php b/src/Model/Item.php
index b6af5e7d9dc81593d5a306a8e1d812ce930a43ec..1382e5217ea7a32b6c431bd76470f60abb0b2d4a 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -766,6 +766,10 @@ class Item extends BaseObject
                                                dba::update('item', $item_fields, ['id' => $item['id']]);
                                        }
                                }
+                       } else {
+                               if (empty($item['iaid'])) {
+                                       // To-Do
+                               }
                        }
 
                        if (!empty($tags)) {

diff --git a/src/Worker/Expire.php b/src/Worker/Expire.php
index 713bfa25e0ad67f6a6f9caab456ba5de7375dffd..342408894ed3a1c3d573e32ddd1b09ac5d6ed59e 100644 (file)
--- a/src/Worker/Expire.php
+++ b/src/Worker/Expire.php
@@ -26,10 +26,13 @@ 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`, `icid` FROM `item` WHERE `deleted` AND `changed` < UTC_TIMESTAMP() - INTERVAL 60 DAY");
+                       $r = dba::p("SELECT `id`, `iaid`, `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']])) {
+                               if (!empty($row['iaid']) && !dba::exists('item', ['iaid' => $row['iaid']])) {
+                                       dba::delete('item-content', ['id' => $row['icid']]);
+                               }
+                               if (!empty($row['icid']) && !dba::exists('item', ['icid' => $row['icid']])) {
                                        dba::delete('item-content', ['id' => $row['icid']]);
                                }
                        }