r76224 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r76223‎ | r76224 | r76225 >
Date:23:49, 6 November 2010
Author:platonides
Status:ok
Tags:
Comment:
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) (history)

Diff [purge]

Index: trunk/phase3/includes/installer/Installer.php
——@@ -231,7 +231,7 @@
232232 wfRestoreWarnings();
233233
234234 if( $ls ) {
235 - $wgCacheEpoch = $wgCommandLineMode = false;
 235+ require( "$IP/includes/DefaultSettings.php" );
236236 require_once( "$IP/LocalSettings.php" );
237237 $vars = get_defined_vars();
238238 if( isset( $vars['wgUpgradeKey'] ) && $vars['wgUpgradeKey'] ) {

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r75392(bug 198: Easy, secure in-place upgrade) Introduce new $wgUpgradeKey. When se...demon23:18, 25 October 2010

Status & tagging log