r97855 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r97854‎ | r97855 | r97856 >
Date:21:27, 22 September 2011
Author:nikerabbit
Status:ok
Tags:
Comment:
rv r97851 for further inspection, causes PHP notices
Modified paths:
  • /trunk/phase3/includes/resourceloader/ResourceLoader.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/resourceloader/ResourceLoader.php
@@ -462,10 +462,9 @@
463463 // On some setups, ob_get_level() doesn't seem to go down to zero
464464 // no matter how often we call ob_get_clean(), so instead of doing
465465 // the more intuitive while ( ob_get_level() > 0 ) ob_get_clean();
466 - // we have to be safe here and check the return value to avoid an
467 - // infinite loop. (bug 26370)
468 - while ( ob_get_level() > 0 && ob_end_clean() ) {
469 - // repeat
 466+ // we have to be safe here and avoid an infinite loop.
 467+ for ( $i = 0; $i < ob_get_level(); $i++ ) {
 468+ ob_end_clean();
470469 }
471470
472471 header( 'HTTP/1.0 304 Not Modified' );

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r97851followup r79862: the for loop only cleans up half the output handlers (since ...vyznev20:44, 22 September 2011

Status & tagging log