Add feedback / revert fix for $item['post-type']

diff --git a/src/Database/Database.php b/src/Database/Database.php
index e4a4a0f571bf4bd0efb0f0c5adcb08872a658d9f..a93d4e610bb69f18d48044a9a78a86b35250decb 100644 (file)
--- a/src/Database/Database.php
+++ b/src/Database/Database.php
@@ -1465,8 +1465,7 @@ class Database
                        $this->logger->notice('Invalid count.', ['table' => $table, 'expression' => $expression, 'condition' => $condition_string, 'callstack' => System::callstack()]);
                        return 0;
                } else {
-                       // Ensure to always return either a "null" or a numeric value
-                       return is_numeric($row['count']) ? (int)$row['count'] : $row['count'];
+                       return (int)$row['count'];
                }
        }
 

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 83cbcbb01a4b97264debe7b6b1dd0a731c65341b..8327252abc7acc2f69bb062cb732e06884edd2e9 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -2259,7 +2259,7 @@ class Item
                $condition[0] .= " AND `received` < UTC_TIMESTAMP() - INTERVAL ? DAY";
                $condition[] = $days;
 
-               $items = Post::select(['resource-id', 'starred', 'id', 'post-type', 'uid', 'uri-id', 'post-type'], $condition);
+               $items = Post::select(['resource-id', 'starred', 'id', 'post-type', 'uid', 'uri-id'], $condition);
 
                if (!DBA::isResult($items)) {
                        return;