diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2019-01-17 21:36:29 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2019-01-17 21:36:29 +0100 |
| commit | 34fe41ac78b6bd465c12086edbbd856d9533065c (patch) | |
| tree | 12e86c946a9a76aa83af0f1f8ff315368e08535c /app/Models | |
| parent | 6bc49e137e2f996f768770c3702d7d6552f556b3 (diff) | |
| parent | 48c901bc5c090ff0ee8397d0b1ecfb337d774a86 (diff) | |
Merge branch 'FreshRSS/dev' into FreshRSS/dev-1.14.0
Diffstat (limited to 'app/Models')
| -rw-r--r-- | app/Models/EntryDAO.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php index 9ae1ed797..21f17c097 100644 --- a/app/Models/EntryDAO.php +++ b/app/Models/EntryDAO.php @@ -839,6 +839,9 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable { $where .= 'f.priority >= ' . FreshRSS_Feed::PRIORITY_NORMAL . ' '; $where .= 'AND e.is_favorite=1 '; break; + case 'S': //Starred + $where .= 'e.is_favorite=1 '; + break; case 'c': //Category $where .= 'f.priority >= ' . FreshRSS_Feed::PRIORITY_NORMAL . ' '; $where .= 'AND f.category=? '; @@ -855,6 +858,9 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable { case 'T': //Any tag $where .= '1=1 '; break; + case 'ST': //Starred or tagged + $where .= 'e.is_favorite=1 OR EXISTS (SELECT et2.id_tag FROM `' . $this->prefix . 'entrytag` et2 WHERE et2.id_entry = e.id) '; + break; default: throw new FreshRSS_EntriesGetter_Exception('Bad type in Entry->listByType: [' . $type . ']!'); } |