From: Timo Tijhof <krinklemail@gmail.com>
Date: Tue, 9 Apr 2013 22:16:22 +0000 (+0200)
Subject: ResourceLoader: Don't cache ob_get_level
X-Git-Tag: 1.31.0-rc.0~20050^2
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmembres/Subpage_test/1/2/%24fid?a=commitdiff_plain;h=951a08113bcf4edce5a7304b556d5a3431565104;p=lhc%2Fweb%2Fwiklou.git

ResourceLoader: Don't cache ob_get_level

Follows-up I0eba7fcc9ce. This was br

Bug: 46836
Change-Id: Ida0e48931781be77327073dc4ed3966949f4b082
---

diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php
index 9b02c6c86e..5d335b02b2 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -601,7 +601,9 @@ class ResourceLoader {
 				// 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 avoid an infinite loop.
-				for ( $i = 0, $len = ob_get_level(); $i < $len; $i++ ) {
+				// Caching the level is not an option, need to allow it to
+				// shorten the loop on-the-fly (bug 46836)
+				for ( $i = 0; $i < ob_get_level(); $i++ ) {
 					ob_end_clean();
 				}