r96538 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r96537‎ | r96538 | r96539 >
Date:01:54, 8 September 2011
Author:demon
Status:ok
Tags:
Comment:
Stupid merge conflicts, fix r96537
Modified paths:
  • /trunk/phase3/maintenance/doMaintenance.php (modified) (history)

Diff [purge]

Index: trunk/phase3/maintenance/doMaintenance.php
@@ -85,10 +85,8 @@
8686 require( MWInit::interpretedPath( '../wmf-config/wgConf.php' ) );
8787 }
8888 // Require the configuration (probably LocalSettings.php)
89 - require( MWInit::interpretedPath( $maintenance->loadSettings() ) );
 89+ require( $maintenance->loadSettings() );
9090 }
91 -// Require the configuration (probably LocalSettings.php)
92 -require( $maintenance->loadSettings() );
9391
9492 if ( $maintenance->getDbType() === Maintenance::DB_ADMIN &&
9593 is_readable( "$IP/AdminSettings.php" ) )

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r96537Last fix for r96529, I swear...only CommonSettings.php needs interpretPath()....demon01:52, 8 September 2011

Status & tagging log