diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2019-01-16 22:26:43 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2019-01-16 22:26:43 +0100 |
| commit | 743c1b740bd8ec0b70f7058d4b52101b346a5e9c (patch) | |
| tree | 7d7c3145ee35b7b37dfc7cf0b7848e85bd3343be /app/Models/EntryDAO.php | |
| parent | 4355849ec36efb3aa4b711912abd71e30cf2d5ee (diff) | |
Export labels (#2217)
* Export labels
https://github.com/FreshRSS/FreshRSS/issues/2196
* Small fixes
* Backport code from 1.14.0
https://github.com/FreshRSS/FreshRSS/pull/2199/commits/4888f919f104b2d170302565e481a0b731eb4145
* More fixes
Diffstat (limited to 'app/Models/EntryDAO.php')
| -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 6d77a33cd..08927196e 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 . ']!'); } |