diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2017-03-26 19:23:37 +0200 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2017-03-26 19:23:37 +0200 |
| commit | e7b153fc7f2f70d963adf21555edd41b35e776a0 (patch) | |
| tree | 960f18ff4cca3eb7f614a8527cd3bc4daf453f70 /app/Controllers/importExportController.php | |
| parent | fd028c6114ff7d66cf717f9964ae0b9702df46de (diff) | |
| parent | 1b34142e7d249363517d326b11eda42446ee85d2 (diff) | |
Merge remote-tracking branch 'FreshRSS/dev' into 1464-improve-english-translations
Diffstat (limited to 'app/Controllers/importExportController.php')
| -rw-r--r-- | app/Controllers/importExportController.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php index 6ae89defb..af3c0bf46 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(); |