diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-04-22 14:04:59 +0200 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-04-22 14:04:59 +0200 |
| commit | 88be296cb2afb53b660b8d52943847cbccb09791 (patch) | |
| tree | 4fb0cc2d047ed1ca123633691115c12fb166109d /app/Models | |
| parent | 9012994afcba7565ebd091e1ae162ee87f6befb1 (diff) | |
| parent | 89cc2aa3d0d2d3faeaf4b7d4ada11e3cd904bea3 (diff) | |
Merge branch 'mysql_only_full_group_by' into dev
Diffstat (limited to 'app/Models')
| -rw-r--r-- | app/Models/CategoryDAO.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/Models/CategoryDAO.php b/app/Models/CategoryDAO.php index b5abac519..fc431553e 100644 --- a/app/Models/CategoryDAO.php +++ b/app/Models/CategoryDAO.php @@ -103,7 +103,7 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo implements FreshRSS_Searchable . ($details ? 'f.* ' : 'f.id, f.name, f.url, f.website, f.priority, f.error, f.cache_nbEntries, f.cache_nbUnreads ') . 'FROM `' . $this->prefix . 'category` c ' . 'LEFT OUTER JOIN `' . $this->prefix . 'feed` f ON f.category=c.id ' - . 'GROUP BY f.id ' + . 'GROUP BY f.id, c_id ' . 'ORDER BY c.name, f.name'; $stm = $this->bd->prepare($sql); $stm->execute(); |