summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2014-08-23 22:02:22 +0200
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2014-08-23 22:02:22 +0200
commit1316ada15260e8f2fdb486595d5953bef9badc50 (patch)
tree106f0b39835e8f278a8515a999c84097d85025b3
parentae54a143860bad200a0ef319052ccec512ef99e3 (diff)
Fix bug add favorite entry
See https://github.com/marienfressinaud/FreshRSS/issues/494
-rw-r--r--app/Controllers/importExportController.php2
-rw-r--r--app/Models/EntryDAO.php2
2 files changed, 2 insertions, 2 deletions
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);