diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2015-05-24 02:01:30 +0200 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2015-05-24 02:01:30 +0200 |
| commit | ed811431a57404f407226ed5fcacf2805531a0d8 (patch) | |
| tree | 3379b1d3ccb6dab7b35c19968d98bce8279cfb92 | |
| parent | 6e01d4504b84e2ffdaa346182b0390d1201bec3e (diff) | |
| parent | b7859f4bde819191d4886ec736351d1e5605c387 (diff) | |
Merge branch 'FreshRSS/dev' into dev
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | app/Models/EntryDAO.php | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a51aaa3b1..b9fe400f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ * Support for internationalized domain name (IDN). * API * Work-around for News+ bug when there is no unread article on the server. +* UI + * New confirmation message when leaving a configuration page without saving the changes. * Bug fixing * Corrected bug introduced in previous beta about handling of HTTP 301 (feeds that have changed address) * Corrected bug in FreshRSS RSS feeds. diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php index eae9683ad..f939a0fb3 100644 --- a/app/Models/EntryDAO.php +++ b/app/Models/EntryDAO.php @@ -511,7 +511,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable { $where .= 'AND e1.id >= ' . $date_min . '000000 '; } $search = ''; - if ($filter !== null) { + if ($filter) { if ($filter->getIntitle()) { $search .= 'AND e1.title LIKE ? '; $values[] = "%{$filter->getIntitle()}%"; |