r109731 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r109730‎ | r109731 | r109732 >
Date:13:47, 22 January 2012
Author:reedy
Status:resolved
Tags:tools 
Comment:
Fix first part of fixme from r109711, getting rid of the static variable
Modified paths:
  • /trunk/tools/mwmultiversion/multiversion/MWVersion.php (modified) (history)

Diff [purge]

Index: trunk/tools/mwmultiversion/multiversion/MWVersion.php
@@ -78,9 +78,9 @@
7979 function getMediaWikiCli( $file ) {
8080 global $IP;
8181
82 - static $multiVersion = null;
 82+ require_once( dirname( __FILE__ ) . '/MWMultiVersion.php' );
 83+ $multiVersion = MWMultiVersion::getInstance();
8384 if( !$multiVersion ) {
84 - require_once( dirname( __FILE__ ) . '/MWMultiVersion.php' );
8585 $multiVersion = MWMultiVersion::initializeForMaintenance();
8686 }
8787 if ( $multiVersion->getDatabase() === 'testwiki' ) {

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r109711* (bug 33284) Make mwscript.php also look in WikimediaMaintenancereedy01:00, 22 January 2012

Status & tagging log