|
@@ -302,12 +302,10 @@ SQL;
|
|
|
. ($details ? 'f.* ' : 'f.id, f.name, f.url, f.kind, f.website, f.priority, f.error, f.attributes, f.`cache_nbEntries`, f.`cache_nbUnreads`, f.ttl ')
|
|
. ($details ? 'f.* ' : 'f.id, f.name, f.url, f.kind, f.website, f.priority, f.error, f.attributes, f.`cache_nbEntries`, f.`cache_nbUnreads`, f.ttl ')
|
|
|
. 'FROM `_category` c '
|
|
. 'FROM `_category` c '
|
|
|
. 'LEFT OUTER JOIN `_feed` f ON f.category=c.id '
|
|
. 'LEFT OUTER JOIN `_feed` f ON f.category=c.id '
|
|
|
- . 'WHERE f.priority >= :priority '
|
|
|
|
|
. 'GROUP BY f.id, c_id '
|
|
. 'GROUP BY f.id, c_id '
|
|
|
. 'ORDER BY c.name, f.name';
|
|
. 'ORDER BY c.name, f.name';
|
|
|
$stm = $this->pdo->prepare($sql);
|
|
$stm = $this->pdo->prepare($sql);
|
|
|
- $values = [ ':priority' => FreshRSS_Feed::PRIORITY_CATEGORY ];
|
|
|
|
|
- if ($stm !== false && $stm->execute($values) && ($res = $stm->fetchAll(PDO::FETCH_ASSOC)) !== false) {
|
|
|
|
|
|
|
+ if ($stm !== false && $stm->execute() && ($res = $stm->fetchAll(PDO::FETCH_ASSOC)) !== false) {
|
|
|
/** @var list<array{c_name:string,c_id:int,c_kind:int,c_last_update:int,c_error:int,c_attributes?:string,
|
|
/** @var list<array{c_name:string,c_id:int,c_kind:int,c_last_update:int,c_error:int,c_attributes?:string,
|
|
|
* id?:int,name?:string,url?:string,kind?:int,category?:int,website?:string,priority?:int,error?:int,attributes?:string,cache_nbEntries?:int,cache_nbUnreads?:int,ttl?:int}> $res */
|
|
* id?:int,name?:string,url?:string,kind?:int,category?:int,website?:string,priority?:int,error?:int,attributes?:string,cache_nbEntries?:int,cache_nbUnreads?:int,ttl?:int}> $res */
|
|
|
return self::daoToCategoriesPrepopulated($res);
|
|
return self::daoToCategoriesPrepopulated($res);
|