From c94639fe2d43c363e2382ada10f07256812f5be4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= Date: Thu, 22 Sep 2011 21:27:04 +0000 Subject: [PATCH] rv r97851 for further inspection, causes PHP notices --- includes/resourceloader/ResourceLoader.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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' ); -- 2.20.1