From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Thu, 22 Sep 2011 21:27:04 +0000 (+0000)
Subject: rv r97851 for further inspection, causes PHP notices
X-Git-Tag: 1.31.0-rc.0~27469
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=c94639fe2d43c363e2382ada10f07256812f5be4;p=lhc%2Fweb%2Fwiklou.git

rv r97851 for further inspection, causes PHP notices
---

diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php
index 488fb77410..70f1d4fed0 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -462,10 +462,9 @@ class ResourceLoader {
 				// 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' );