diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2013-12-25 18:18:14 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2013-12-25 18:18:14 +0100 |
| commit | c2375265c040da5b71c4acf2871f5479fab3044c (patch) | |
| tree | 3d25d912734b42ba44fdee77a0b93c4877356f8b /app/Models/EntryDAO.php | |
| parent | 06d4b8d10247146d9c6f7c78ff9fc584438dd8fe (diff) | |
Fin taille historique
Permet d'éviter les problèmes de flux vides à l'importation
https://github.com/marienfressinaud/FreshRSS/issues/332 , ou de nombre
d'articles non-lus qui ne correspondent pas au nombre d'articles
affichés
Diffstat (limited to 'app/Models/EntryDAO.php')
| -rw-r--r-- | app/Models/EntryDAO.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php index 14d3ddcff..99aaf3a0d 100644 --- a/app/Models/EntryDAO.php +++ b/app/Models/EntryDAO.php @@ -307,7 +307,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo { $where .= 'AND e1.id ' . ($order === 'DESC' ? '<=' : '>=') . $firstId . ' '; } if (($date_min > 0) && ($type !== 's')) { - $where .= 'AND (e1.id >= ' . $date_min . '000000 OR e1.is_favorite = 1 OR (f.keep_history <> 0'; + $where .= 'AND (e1.id >= ' . $date_min . '000000 OR e1.is_read = 0 OR e1.is_favorite = 1 OR (f.keep_history <> 0'; if (intval($keepHistoryDefault) === 0) { $where .= ' AND f.keep_history <> -2'; //default } |