http://www.mediawiki.org/wiki/Special:Code/MediaWiki/76224
Revision: 76224 Author: platonides Date: 2010-11-06 23:49:06 +0000 (Sat, 06 Nov 2010) Log Message: ----------- Follow up r75392. 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! Modified Paths: -------------- trunk/phase3/includes/installer/Installer.php Modified: trunk/phase3/includes/installer/Installer.php =================================================================== --- trunk/phase3/includes/installer/Installer.php 2010-11-06 22:46:37 UTC (rev 76223) +++ trunk/phase3/includes/installer/Installer.php 2010-11-06 23:49:06 UTC (rev 76224) @@ -231,7 +231,7 @@ 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'] ) { _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs