From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Sat, 17 Dec 2011 05:02:15 +0000 (+0000)
Subject: FU r98698: Show any PHP warnings in tryRespondFromFileCache() in debug mode
X-Git-Tag: 1.31.0-rc.0~25925
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=5dc9336cf41e7bbd58b923e7edf8ee6017eca979;p=lhc%2Fweb%2Fwiklou.git

FU r98698: Show any PHP warnings in tryRespondFromFileCache() in debug mode
---

diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php
index ac62cb0959..1024ce5b38 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -573,6 +573,11 @@ class ResourceLoader {
 				return false; // output handled (buffers cleared)
 			}
 			$response = $fileCache->fetchText();
+			// Capture any PHP warnings from the output buffer and append them to the
+			// response in a comment if we're in debug mode.
+			if ( $context->getDebug() && strlen( $warnings = ob_get_contents() ) ) {
+				$response = "/*\n$warnings\n*/\n" . $response;
+			}
 			// Remove the output buffer and output the response
 			ob_end_clean();
 			echo $response . "\n/* Cached {$ts} */";