diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2013-12-15 04:20:23 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2013-12-15 04:20:23 +0100 |
| commit | 74bceb2e2cdf0e3da5fb36990f3ee54e745e3d09 (patch) | |
| tree | c8c7c14f50877121043eeab5cdd87bc96efdff67 /app/Models/EntryDAO.php | |
| parent | 7e64cda41548500c25825cca29bb7e0167249b83 (diff) | |
Date minimum : cas des favoris et de l'historique complet
Suite de https://github.com/marienfressinaud/FreshRSS/issues/323
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 b61b97624..1bce6cbf2 100644 --- a/app/Models/EntryDAO.php +++ b/app/Models/EntryDAO.php @@ -303,7 +303,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo { $where .= 'AND e.id ' . ($order === 'DESC' ? '<=' : '>=') . $firstId . ' '; } if ($date_min > 0) { - $where .= 'AND e.id >= ' . $date_min . '000000 '; + $where .= 'AND (e.id >= ' . $date_min . '000000 OR e.is_favorite = 1 OR f.keep_history = 1) '; } $terms = array_unique(explode(' ', trim($filter))); sort($terms); //Put #tags first |