diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2018-09-08 23:05:56 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2018-09-08 23:05:56 +0200 |
| commit | c65f5358904c585ce144885be2fbcd960adaf1e6 (patch) | |
| tree | 3c0feaecfd6668dabc4d7d2766d341c0fbd76091 | |
| parent | c24bf33e58acdcfb3b3b827a2f0609fa13747509 (diff) | |
Fix count unreads in SQLite (#2009)
* Fix count unreads in SQLite
Was wrong in e.g. `./cli/user-info.php` because UNION output order in
MySQL and SQLite is differents...
* Changelog 2009
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | app/Models/EntryDAO.php | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0112ae636..2466c1088 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ * Fix Fever API to allow 32-bit architectures [#1962](https://github.com/FreshRSS/FreshRSS/issues/1962) * Fix CSS font bug for *Origine-compact* theme [#1990](https://github.com/FreshRSS/FreshRSS/issues/1990) * Fix last user activity for SQLite and PostgreSQL [#2008](https://github.com/FreshRSS/FreshRSS/pull/2008) + * Fix article counts with SQLite [#2009](https://github.com/FreshRSS/FreshRSS/pull/2009) * Security * Avoid feed credentials in logs [#1949](https://github.com/FreshRSS/FreshRSS/pull/1949) * UI diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php index e17f6ff34..f0e164995 100644 --- a/app/Models/EntryDAO.php +++ b/app/Models/EntryDAO.php @@ -909,6 +909,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable { $stm = $this->bd->prepare($sql); $stm->execute(); $res = $stm->fetchAll(PDO::FETCH_COLUMN, 0); + rsort($res); $all = empty($res[0]) ? 0 : $res[0]; $unread = empty($res[1]) ? 0 : $res[1]; return array('all' => $all, 'unread' => $unread, 'read' => $all - $unread); @@ -963,6 +964,7 @@ SQL; $stm = $this->bd->prepare($sql); $stm->execute(array(':priority_normal' => FreshRSS_Feed::PRIORITY_NORMAL)); $res = $stm->fetchAll(PDO::FETCH_COLUMN, 0); + rsort($res); $all = empty($res[0]) ? 0 : $res[0]; $unread = empty($res[1]) ? 0 : $res[1]; return array('all' => $all, 'unread' => $unread, 'read' => $all - $unread); |