X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Finstaller%2FMssqlInstaller.php;h=4d79d9665b5ad69bc6b5f112edb1c7fe440a78d3;hb=43f904b51a746d7f71ea2ab9951c5c98d269765b;hp=46bb86c01009416d8413616767df41f66f9ff920;hpb=91b07c5e0950572fb41f7d8f466fb6b3bbe98be5;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/installer/MssqlInstaller.php b/includes/installer/MssqlInstaller.php
index 46bb86c010..4d79d9665b 100644
--- a/includes/installer/MssqlInstaller.php
+++ b/includes/installer/MssqlInstaller.php
@@ -537,7 +537,6 @@ class MssqlInstaller extends DatabaseInstaller {
 		$this->setupSchemaVars();
 		$dbName = $this->getVar( 'wgDBname' );
 		$this->db->selectDB( $dbName );
-		$server = $this->getVar( 'wgDBserver' );
 		$password = $this->getVar( 'wgDBpassword' );
 		$schemaName = $this->getVar( 'wgDBmwschema' );
 
@@ -652,9 +651,9 @@ class MssqlInstaller extends DatabaseInstaller {
 	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(
+		return array_merge( parent::getGlobalDefaults(), array(
 			'wgDBmwschema' => 'mediawiki',
-		);
+		) );
 	}
 
 	/**