Alexandre Alapetite 8 years ago
parent cc235c6af3
commit 7a6751b50d
  1. 9
      app/Controllers/importExportController.php
  2. 4
      app/Models/EntryDAO.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();

@ -152,7 +152,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
}
if ($this->addEntryPrepared && $this->addEntryPrepared->execute()) {
return $this->bd->lastInsertId();
return true;
} else {
$info = $this->addEntryPrepared == null ? array(0 => '', 1 => '', 2 => 'syntax error') : $this->addEntryPrepared->errorInfo();
if ($this->autoUpdateDb($info)) {
@ -212,7 +212,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
}
if ($this->updateEntryPrepared && $this->updateEntryPrepared->execute()) {
return $this->bd->lastInsertId();
return true;
} else {
$info = $this->updateEntryPrepared == null ? array(0 => '', 1 => '', 2 => 'syntax error') : $this->updateEntryPrepared->errorInfo();
if ($this->autoUpdateDb($info)) {

Loading…
Cancel
Save