diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
commit | 1de335ad3f395ca6861085393ba366a9e3fb4a0d (patch) | |
tree | f1fdd326034e05177596851be6a7127615d81498 /includes/installer/MssqlInstaller.php | |
parent | 9c75fa8ff6d4d38ef552c00fef5969fb154765e8 (diff) | |
parent | f6d65e533c62f6deb21342d4901ece24497b433e (diff) |
Merge commit 'f6d65'
# Conflicts:
# skins/ArchLinux/ArchLinux.php
Diffstat (limited to 'includes/installer/MssqlInstaller.php')
-rw-r--r-- | includes/installer/MssqlInstaller.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/installer/MssqlInstaller.php b/includes/installer/MssqlInstaller.php index 46bb86c0..5a8403f5 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', - ); + ) ); } /** |