summaryrefslogtreecommitdiff
path: root/app/Models
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2016-04-24 14:53:19 +0200
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2016-04-24 14:53:19 +0200
commitf54876ac2dca6f2685f35891465f71d56e1f6c86 (patch)
tree3e185aafd8be1319b922883435d73affb7986afc /app/Models
parent152b8171b5570b8a72b840b5c150f49acffea55f (diff)
parent89cc2aa3d0d2d3faeaf4b7d4ada11e3cd904bea3 (diff)
Merge pull request #1132 from Alkarex/mysql_only_full_group_by
MySQL compatibility only_full_group_by
Diffstat (limited to 'app/Models')
-rw-r--r--app/Models/CategoryDAO.php2
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();