From 50075bfbdcd6a7be010eb82ce1fffac0ea283de7 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Tue, 19 Aug 2014 20:58:18 +0200 Subject: Improvement for ASC order https://github.com/marienfressinaud/FreshRSS/issues/495 --- app/Models/EntryDAO.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/Models/EntryDAO.php') diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php index a9ffa138b..488b70fb6 100644 --- a/app/Models/EntryDAO.php +++ b/app/Models/EntryDAO.php @@ -230,7 +230,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo { } $this->bd->beginTransaction(); - $sql = 'UPDATE `' . $this->prefix . 'entry` ' + $sql = 'UPDATE `' . $this->prefix . 'entry` ' . 'SET is_read=1 ' . 'WHERE id_feed=? AND is_read=0 AND id <= ?'; $values = array($id, $idMax); -- cgit v1.2.3 From 1316ada15260e8f2fdb486595d5953bef9badc50 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Sat, 23 Aug 2014 22:02:22 +0200 Subject: Fix bug add favorite entry See https://github.com/marienfressinaud/FreshRSS/issues/494 --- app/Controllers/importExportController.php | 2 +- app/Models/EntryDAO.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'app/Models/EntryDAO.php') diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php index b3683f385..5adf3878a 100644 --- a/app/Controllers/importExportController.php +++ b/app/Controllers/importExportController.php @@ -284,7 +284,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController { $url = $origin[$key]; $name = $origin['title']; $website = $origin['htmlUrl']; - $error = false; + try { // Create a Feed object and add it in DB $feed = new FreshRSS_Feed($url); diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php index 488b70fb6..75a8aeba4 100644 --- a/app/Models/EntryDAO.php +++ b/app/Models/EntryDAO.php @@ -65,7 +65,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo { } if (!isset($existingGuids[$entry->guid()]) && - ($feedHistory != 0 || $eDate >= $date_min)) { + ($feedHistory != 0 || $eDate >= $date_min || $entry->isFavorite())) { $values = $entry->toArray(); $useDeclaredDate = empty($existingGuids); -- cgit v1.2.3