r50330 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r50329‎ | r50330 | r50331 >
Date:08:54, 8 May 2009
Author:ialex
Status:ok
Tags:
Comment:
* Fix for r50316 and r50324: require ProfilerStub.php if StartProfiler.php doesn't exist to aviod call to undefined function wfProfileIn()
* Removed already commented out "require_once( $IP.'/includes/ProfilerStub.php' );" now really obsolete
Modified paths:
  • /trunk/phase3/maintenance/commandLine.inc (modified) (history)

Diff [purge]

Index: trunk/phase3/maintenance/commandLine.inc
@@ -45,7 +45,9 @@
4646 : realpath( dirname( __FILE__ ) . '/..' );
4747 #chdir( $IP );
4848 if ( file_exists( "$IP/StartProfiler.php" ) ) {
49 - require_once( "$IP/StartProfiler.php" );
 49+ require_once( "$IP/StartProfiler.php" );
 50+} else {
 51+ require_once( "$IP/includes/ProfilerStub.php" );
5052 }
5153
5254 $options = array();
@@ -196,8 +198,7 @@
197199 $wgCommandLineMode = true;
198200 $DP = $IP;
199201 require_once( "$IP/includes/AutoLoader.php" );
200 - #require_once( $IP.'/includes/ProfilerStub.php' );
201 - require_once( $IP.'/includes/Defines.php' );
 202+ require_once( "$IP/includes/Defines.php" );
202203 require_once( $settingsFile );
203204 /* ini_set( 'include_path', ".$sep$IP$sep$IP/includes$sep$IP/languages$sep$IP/maintenance" ); */
204205

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r50316Removed StartProfiler.php from SVN control and added StartProfiler.sample fil...aaron18:30, 7 May 2009
r50324Followup to r50316: Fix inclusion of profiler in maintenance scripts.demon20:30, 7 May 2009

Status & tagging log