http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97855
Revision: 97855
Author: nikerabbit
Date: 2011-09-22 21:27:04 +0000 (Thu, 22 Sep 2011)
Log Message:
-----------
rv r97851 for further inspection, causes PHP notices
Modified Paths:
--------------
trunk/phase3/includes/resourceloader/ResourceLoader.php
Modified: trunk/phase3/includes/resourceloader/ResourceLoader.php
===================================================================
--- trunk/phase3/includes/resourceloader/ResourceLoader.php 2011-09-22
21:25:49 UTC (rev 97854)
+++ trunk/phase3/includes/resourceloader/ResourceLoader.php 2011-09-22
21:27:04 UTC (rev 97855)
@@ -462,10 +462,9 @@
// On some setups, ob_get_level() doesn't seem
to go down to zero
// no matter how often we call ob_get_clean(),
so instead of doing
// the more intuitive while ( ob_get_level() >
0 ) ob_get_clean();
- // we have to be safe here and check the return
value to avoid an
- // infinite loop. (bug 26370)
- while ( ob_get_level() > 0 && ob_end_clean() ) {
- // repeat
+ // we have to be safe here and avoid an
infinite loop.
+ for ( $i = 0; $i < ob_get_level(); $i++ ) {
+ ob_end_clean();
}
header( 'HTTP/1.0 304 Not Modified' );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
