X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Finstaller%2FMssqlInstaller.php;h=5a8403f5522ddb4ede497c0146f68958b2bddf20;hb=88bf68f5fbe662d4677337d698a64bf8abe88b3e;hp=83681b6b294eeae803821cfb16e523d41d92dd0c;hpb=027731f57f6c8dc45c1cef9cd5d2a8d8b7981746;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/installer/MssqlInstaller.php b/includes/installer/MssqlInstaller.php
index 83681b6b29..5a8403f552 100644
--- a/includes/installer/MssqlInstaller.php
+++ b/includes/installer/MssqlInstaller.php
@@ -652,9 +652,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',
-		);
+		) );
 	}
 
 	/**
@@ -702,7 +702,7 @@ class MssqlInstaller extends DatabaseInstaller {
 	/**
 	 * Try to see if a given fulltext catalog exists
 	 * We assume we already have the appropriate database selected
-	 * @param string $schemaName Catalog name to check
+	 * @param string $catalogName Catalog name to check
 	 * @return bool
 	 */
 	private function catalogExists( $catalogName ) {