From: umherirrender <umherirrender_de.wp@web.de>
Date: Fri, 3 Jan 2014 15:32:33 +0000 (+0100)
Subject: Call Database::makeInsertOptions from Database::insertSelect
X-Git-Tag: 1.31.0-rc.0~17392
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=382651e2f1fd92205a042683608442ca4083f864;p=lhc%2Fweb%2Fwiklou.git

Call Database::makeInsertOptions from Database::insertSelect

This allows other database types to modify the options.

Bug: 59233
Change-Id: I45a2c7944057f43453423c8edbe5d173b1fc067d
---

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 3388297e80..e4ff5ee450 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -2875,10 +2875,12 @@ abstract class DatabaseBase implements IDatabase, DatabaseType {
 	) {
 		$destTable = $this->tableName( $destTable );
 
-		if ( is_array( $insertOptions ) ) {
-			$insertOptions = implode( ' ', $insertOptions );
+		if ( !is_array( $insertOptions ) ) {
+			$insertOptions = array( $insertOptions );
 		}
 
+		$insertOptions = $this->makeInsertOptions( $insertOptions );
+
 		if ( !is_array( $selectOptions ) ) {
 			$selectOptions = array( $selectOptions );
 		}