Browse Source

Fix bug add favorite entry

See https://github.com/marienfressinaud/FreshRSS/issues/494
Marien Fressinaud 11 years ago
parent
commit
1316ada152
2 changed files with 2 additions and 2 deletions
  1. 1 1
      app/Controllers/importExportController.php
  2. 1 1
      app/Models/EntryDAO.php

+ 1 - 1
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);

+ 1 - 1
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);