Follow up r75392.
authorPlatonides <platonides@users.mediawiki.org>
Sat, 6 Nov 2010 23:49:06 +0000 (23:49 +0000)
committerPlatonides <platonides@users.mediawiki.org>
Sat, 6 Nov 2010 23:49:06 +0000 (23:49 +0000)
DefaultSettings.php were not included by LocalSettings, since it was already required in global scope.
Force an inclusion before LocalSettings. It is safe to do so, since it only contains variables, shame to
anyone adding functions or classes there!

includes/installer/Installer.php

index 7b1d451..1222802 100644 (file)
@@ -231,7 +231,7 @@ abstract class Installer {
                wfRestoreWarnings();
 
                if( $ls ) {
-                       $wgCacheEpoch = $wgCommandLineMode = false;
+                       require( "$IP/includes/DefaultSettings.php" );
                        require_once( "$IP/LocalSettings.php" );
                        $vars = get_defined_vars();
                        if( isset( $vars['wgUpgradeKey'] ) && $vars['wgUpgradeKey'] ) {