From: umherirrender <umherirrender_de.wp@web.de>
Date: Mon, 3 Feb 2014 20:42:04 +0000 (+0100)
Subject: Standardize is_array check in Database::upsert
X-Git-Tag: 1.31.0-rc.0~17039
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=4c95d41c76e29447ee8cb4e98df879f1eafd5af0;p=lhc%2Fweb%2Fwiklou.git

Standardize is_array check in Database::upsert

Change-Id: I81c7ff2cf6a1f5fe0a2a6cdad1dd26d746e17c10
---

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 90e658fdd8..f94d5861d5 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -2696,7 +2696,10 @@ abstract class DatabaseBase implements IDatabase, DatabaseType {
 		if ( !count( $rows ) ) {
 			return true; // nothing to do
 		}
-		$rows = is_array( reset( $rows ) ) ? $rows : array( $rows );
+
+		if ( !is_array( reset( $rows ) ) ) {
+			$rows = array( $rows );
+		}
 
 		if ( count( $uniqueIndexes ) ) {
 			$clauses = array(); // list WHERE clauses that each identify a single row
diff --git a/includes/db/DatabaseMysqlBase.php b/includes/db/DatabaseMysqlBase.php
index 647a42ae31..85be31c920 100644
--- a/includes/db/DatabaseMysqlBase.php
+++ b/includes/db/DatabaseMysqlBase.php
@@ -996,7 +996,10 @@ abstract class DatabaseMysqlBase extends DatabaseBase {
 		if ( !count( $rows ) ) {
 			return true; // nothing to do
 		}
-		$rows = is_array( reset( $rows ) ) ? $rows : array( $rows );
+
+		if ( !is_array( reset( $rows ) ) ) {
+			$rows = array( $rows );
+		}
 
 		$table = $this->tableName( $table );
 		$columns = array_keys( $rows[0] );