Ver código fonte

PDO fix PHP 7.1

http://php.net/manual/migration71.changed-functions.php#migration71.changed-functions.pdo
Alexandre Alapetite 9 anos atrás
pai
commit
7a6751b50d

+ 4 - 5
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();
 

+ 2 - 2
app/Models/EntryDAO.php

@@ -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)) {