diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2015-06-04 07:31:04 +0200 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2015-06-04 07:58:39 +0200 |
| commit | f6d65e533c62f6deb21342d4901ece24497b433e (patch) | |
| tree | f28adf0362d14bcd448f7b65a7aaf38650f923aa /includes/installer/MssqlInstaller.php | |
| parent | c27b2e832fe25651ef2410fae85b41072aae7519 (diff) | |
Update to MediaWiki 1.25.1
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', - ); + ) ); } /** |