From 4c95d41c76e29447ee8cb4e98df879f1eafd5af0 Mon Sep 17 00:00:00 2001 From: umherirrender Date: Mon, 3 Feb 2014 21:42:04 +0100 Subject: [PATCH] Standardize is_array check in Database::upsert Change-Id: I81c7ff2cf6a1f5fe0a2a6cdad1dd26d746e17c10 --- includes/db/Database.php | 5 ++++- includes/db/DatabaseMysqlBase.php | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) 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] ); -- 2.20.1