jenkins-bot has submitted this change and it was merged.
Change subject: ResourceLoader: Don't cache ob_get_level
......................................................................
ResourceLoader: Don't cache ob_get_level
Follows-up I0eba7fcc9ce. This was br
Bug: 46836
Change-Id: Ida0e48931781be77327073dc4ed3966949f4b082
---
M includes/resourceloader/ResourceLoader.php
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Hoo man: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/resourceloader/ResourceLoader.php
b/includes/resourceloader/ResourceLoader.php
index 9b02c6c..5d335b0 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -601,7 +601,9 @@
// 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();
}
--
To view, visit https://gerrit.wikimedia.org/r/58429
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ida0e48931781be77327073dc4ed3966949f4b082
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
