Merge branch 'FreshRSS/dev' into defered-insertion

1 files changed, 4 insertions, 5 deletions

diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index ededfe506..82c49cc6a 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -464,15 +464,14 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			}
 
 			$values = $entry->toArray();
+			$ok = false;
 			if (isset($existingHashForGuids[$entry->guid()])) {
-				$id = $this->entryDAO->updateEntry($values);
+				$ok = $this->entryDAO->updateEntry($values);
 			} else {
-				$id = $this->entryDAO->addEntry($values);
+				$ok = $this->entryDAO->addEntry($values);
 			}
+			$error |= ($ok === false);
 
-			if (!$error && ($id === false)) {
-				$error = true;
-			}
 		}
 		$this->entryDAO->commit();
 		$entryDAO->commitNewEntries();