r63545 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r63544‎ | r63545 | r63546 >
Date:12:44, 10 March 2010
Author:demon
Status:ok
Tags:
Comment:
Fix regression from r51677, still need to load AdminSettings if it exists for back-compat. Needs backporting to REL1_16.
Modified paths:
  • /trunk/phase3/maintenance/doMaintenance.php (modified) (history)

Diff [purge]

Index: trunk/phase3/maintenance/doMaintenance.php
@@ -76,6 +76,11 @@
7777 } else {
7878 require_once( $maintenance->loadSettings() );
7979 }
 80+if ( $maintenance->getDbType() === Maintenance::DB_ADMIN &&
 81+ is_readable( "$IP/AdminSettings.php" ) )
 82+{
 83+ require( "$IP/AdminSettings.php" );
 84+}
8085 $maintenance->finalSetup();
8186 // Some last includes
8287 require_once( "$IP/includes/Setup.php" );

Follow-up revisions

RevisionCommit summaryAuthorDate
r63546Followup r63545: Whoops make that publicdemon12:45, 10 March 2010
r63548Backport r63545,r63546 REL1_16 (Fix regression from r51677, still need to loa...demon12:54, 10 March 2010

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r51677* AdminSettings is dead, forever and ever...demon03:39, 10 June 2009

Status & tagging log