jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Philipp 2021-09-15 08:48:41 +02:00
parent 462f76352e
commit 6893e2c3f7
No known key found for this signature in database
GPG key ID: 24A7501396EB5432
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Database/Database.php
View file

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

2
src/Model/Item.php
View file

@ -2259,7 +2259,7 @@ class Item
$condition[0] .= " AND `received` < UTC_TIMESTAMP() - INTERVAL ? DAY"; $condition[0] .= " AND `received` < UTC_TIMESTAMP() - INTERVAL ? DAY";
$condition[] = $days; $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)) { if (!DBA::isResult($items)) {
return; return;