X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Finstaller%2FMssqlInstaller.php;h=83681b6b294eeae803821cfb16e523d41d92dd0c;hb=2bd62bae996af13fb37263a6d15b348db1cb1fd6;hp=51db148a1eec09651aa3072716121090918062f0;hpb=63dbc0aba243c7dcaa820220c2cb1aa2cc91eca1;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/installer/MssqlInstaller.php b/includes/installer/MssqlInstaller.php
index 51db148a1e..83681b6b29 100644
--- a/includes/installer/MssqlInstaller.php
+++ b/includes/installer/MssqlInstaller.php
@@ -218,6 +218,7 @@ class MssqlInstaller extends DatabaseInstaller {
 				'password' => $password,
 				'dbname' => false,
 				'flags' => 0,
+				'schema' => $this->getVar( 'wgDBmwschema' ),
 				'tablePrefix' => $this->getVar( 'wgDBprefix' ) ) );
 			$db->prepareStatements( false );
 			$db->scrollableCursor( false );
@@ -648,6 +649,14 @@ class MssqlInstaller extends DatabaseInstaller {
 		return $status;
 	}
 
+	public function getGlobalDefaults() {
+		// The default $wgDBmwschema is null, which breaks Postgres and other DBMSes that require
+		// the use of a schema, so we need to set it here
+		return array(
+			'wgDBmwschema' => 'mediawiki',
+		);
+	}
+
 	/**
 	 * Try to see if the login exists
 	 * @param string $user Username to check