diff options
| author |  Alexis Degrugillier <github@ainw.org>
| 2014-04-13 08:16:43 -0400 |
|---|---|---|
| committer | Alexis Degrugillier <github@ainw.org>
| 2014-04-13 08:16:43 -0400 |
| commit | 3a736e902c5af7f215bbf91dc54be00bf82f8df3 (patch) | |
| tree | c816621869648d7fc541e2b21b132e6f0b45a25f /app/Models/EntryDAO.php | |
| parent | 1e032608a61c29a29d418451018b3eb86843f8cf (diff) | |
Move state constants from Configuration to Entry
Diffstat (limited to 'app/Models/EntryDAO.php')
| -rw-r--r-- | app/Models/EntryDAO.php | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php index 3f3cc478b..285ad431f 100644 --- a/app/Models/EntryDAO.php +++ b/app/Models/EntryDAO.php @@ -408,7 +408,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo { private function sqlListWhere($type = 'a', $id = '', $state = null , $order = 'DESC', $limit = 1, $firstId = '', $filter = '', $date_min = 0, $showOlderUnreadsorFavorites = false, $keepHistoryDefault = 0) { if (!$state) { - $state = FreshRSS_Configuration::STATE_ALL; + $state = FreshRSS_Entry::STATE_ALL; } $where = ''; $joinFeed = false; @@ -438,23 +438,23 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo { throw new FreshRSS_EntriesGetter_Exception ('Bad type in Entry->listByType: [' . $type . ']!'); } - if ($state & FreshRSS_Configuration::STATE_NOT_READ) { - if (!($state & FreshRSS_Configuration::STATE_READ)) { + if ($state & FreshRSS_Entry::STATE_NOT_READ) { + if (!($state & FreshRSS_Entry::STATE_READ)) { $where .= 'AND e1.is_read = 0 '; } } - if ($state & FreshRSS_Configuration::STATE_READ) { - if (!($state & FreshRSS_Configuration::STATE_NOT_READ)) { + if ($state & FreshRSS_Entry::STATE_READ) { + if (!($state & FreshRSS_Entry::STATE_NOT_READ)) { $where .= 'AND e1.is_read = 1 '; } } - if ($state & FreshRSS_Configuration::STATE_NOT_FAVORITE) { - if (!($state & FreshRSS_Configuration::STATE_FAVORITE)) { + if ($state & FreshRSS_Entry::STATE_NOT_FAVORITE) { + if (!($state & FreshRSS_Entry::STATE_FAVORITE)) { $where .= 'AND e1.is_favorite = 0 '; } } - if ($state & FreshRSS_Configuration::STATE_FAVORITE) { - if (!($state & FreshRSS_Configuration::STATE_NOT_FAVORITE)) { + if ($state & FreshRSS_Entry::STATE_FAVORITE) { + if (!($state & FreshRSS_Entry::STATE_NOT_FAVORITE)) { $where .= 'AND e1.is_favorite = 1 '; } } |