diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-07-07 22:01:53 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-07-07 22:01:53 +0200 |
| commit | 7a653e73682334f8b1f1d303e3c645b714a2cb36 (patch) | |
| tree | 5f61f26941dfd3112a81a8a8786590edbebc758e | |
| parent | dd627292283dc6253e52dd5ff3575ceac509db66 (diff) | |
| parent | e358c5e2e1f39ebc2b580fdd31f085d3423e9401 (diff) | |
Merge branch 'dev' of github.com:marienfressinaud/freshrss into dev
| -rw-r--r-- | app/Models/EntryDAOSQLite.php | 2 | ||||
| -rw-r--r-- | app/Models/FeedDAOSQLite.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/Models/EntryDAOSQLite.php b/app/Models/EntryDAOSQLite.php index 4680c3eaa..efcbed521 100644 --- a/app/Models/EntryDAOSQLite.php +++ b/app/Models/EntryDAOSQLite.php @@ -10,7 +10,7 @@ class FreshRSS_EntryDAOSQLite extends FreshRSS_EntryDAO { $sql = 'UPDATE `' . $this->prefix . 'feed` ' . 'SET cache_nbUnreads=(' . 'SELECT COUNT(*) AS nbUnreads FROM `' . $this->prefix . 'entry` e ' - . 'WHERE e.id_feed=feed.id AND e.is_read=0) ' + . 'WHERE e.id_feed=`' . $this->prefix . 'feed`.id AND e.is_read=0) ' . 'WHERE 1'; $values = array(); if ($feedId !== false) { diff --git a/app/Models/FeedDAOSQLite.php b/app/Models/FeedDAOSQLite.php index bb75c860b..0d1872389 100644 --- a/app/Models/FeedDAOSQLite.php +++ b/app/Models/FeedDAOSQLite.php @@ -4,8 +4,8 @@ class FreshRSS_FeedDAOSQLite extends FreshRSS_FeedDAO { public function updateCachedValues() { //For one single feed, call updateLastUpdate($id) $sql = 'UPDATE `' . $this->prefix . 'feed` ' - . 'SET cache_nbEntries=(SELECT COUNT(e1.id) FROM `' . $this->prefix . 'entry` e1 WHERE e1.id_feed=feed.id),' - . 'cache_nbUnreads=(SELECT COUNT(e2.id) FROM `' . $this->prefix . 'entry` e2 WHERE e2.id_feed=feed.id AND e2.is_read=0)'; + . 'SET cache_nbEntries=(SELECT COUNT(e1.id) FROM `' . $this->prefix . 'entry` e1 WHERE e1.id_feed=`' . $this->prefix . 'feed`.id),' + . 'cache_nbUnreads=(SELECT COUNT(e2.id) FROM `' . $this->prefix . 'entry` e2 WHERE e2.id_feed=`' . $this->prefix . 'feed`.id AND e2.is_read=0)'; $stm = $this->bd->prepare($sql); if ($stm && $stm->execute()) { return $stm->rowCount(); |