Remove assignment in conditional.

cakephp · Oct 31, 2013 · 776fcad · 776fcad
1 parent f4e1414
commit 776fcad
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/Cake/Database/Statement/StatementDecorator.php b/Cake/Database/Statement/StatementDecorator.php
@@ -272,7 +272,11 @@ public function bind($params, $types) {
  * @return string
  */
 	public function lastInsertId($table = null, $column = null) {
-		if ($column && $row = $this->fetch('assoc')) {
+		$row = null;
+		if ($column) {
+			$row = $this->fetch('assoc');
+		}
+		if ($column && $row) {
 			return $row[$column];
 		}
 		return $this->_driver->lastInsertId($table, $column);