From 5dc9336cf41e7bbd58b923e7edf8ee6017eca979 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Sat, 17 Dec 2011 05:02:15 +0000 Subject: [PATCH] FU r98698: Show any PHP warnings in tryRespondFromFileCache() in debug mode --- includes/resourceloader/ResourceLoader.php | 5 +++++ 1 file changed, 5 insertions(+) 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} */"; -- 2.20.1