r112021 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r112020‎ | r112021 | r112022 >
Date:16:48, 21 February 2012
Author:johnduhart
Status:ok
Tags:
Comment:
Followup r105123, fix for MWDebug logging SQL queries on command line mode
Modified paths:
  • /trunk/phase3/includes/Setup.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/Setup.php
@@ -361,7 +361,10 @@
362362 $wgCookieSecure = ( substr( $wgServer, 0, 6 ) === 'https:' );
363363 }
364364
365 -if ( $wgDebugToolbar ) {
 365+// Disable MWDebug for command line mode, this prevents MWDebug from eating up
 366+// all the memory from logging SQL queries on maintenance scripts
 367+global $wgCommandLineMode;
 368+if ( $wgDebugToolbar && !$wgCommandLineMode ) {
366369 MWDebug::init();
367370 }
368371
@@ -410,7 +413,6 @@
411414 }
412415
413416 # Useful debug output
414 -global $wgCommandLineMode;
415417 if ( $wgCommandLineMode ) {
416418 $wgRequest = new FauxRequest( array() );
417419

Follow-up revisions

RevisionCommit summaryAuthorDate
r112024MFT r111658, r111965, r111966, r111967, r112021reedy17:07, 21 February 2012
r112027MFT r111580, r111695, r111697, r111832, r112021reedy17:29, 21 February 2012

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r105123svn:eol-style native on all phase3 stuff, since I messed that up in r105122...johnduhart18:35, 4 December 2011

Status & tagging log