Date minimum : cas des favoris et de l'historique complet

Suite de https://github.com/marienfressinaud/FreshRSS/issues/323
This commit is contained in:
Alexandre Alapetite committed 2013-12-15 04:20:23 +01:00
1 parent 7e64cda415
commit 74bceb2e2c
1 file changed
+1 -1
+1 -1
View File
@@ -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