Followup r78924: keep track of exception/warning comments separately, to prevent...

diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php
index 4db401b..91a5a7c 100644 (file)
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -155,7 +155,7 @@ class ResourceLoader {
                        $cache->set( $key, $result );
                } catch ( Exception $exception ) {
                        // Return exception as a comment
-                       $result = "/*\n{$exception->__toString()}\n*/";
+                       $result = "/*\n{$exception->__toString()}\n*/\n";
                }
 
                wfProfileOut( __METHOD__ );
@@ -293,7 +293,7 @@ class ResourceLoader {
                ob_start();
 
                wfProfileIn( __METHOD__ );
-               $response = '';
+               $exceptions = '';
 
                // Split requested modules into two groups, modules and missing
                $modules = array();
@@ -324,7 +324,7 @@ class ResourceLoader {
                        $this->preloadModuleInfo( array_keys( $modules ), $context );
                } catch( Exception $e ) {
                        // Add exception to the output as a comment
-                       $response .= "/*\n{$e->__toString()}\n*/";
+                       $exceptions .= "/*\n{$e->__toString()}\n*/\n";
                }
 
                wfProfileIn( __METHOD__.'-getModifiedTime' );
@@ -342,7 +342,7 @@ class ResourceLoader {
                                $mtime = max( $mtime, $module->getModifiedTime( $context ) );
                        } catch ( Exception $e ) {
                                // Add exception to the output as a comment
-                               $response .= "/*\n{$e->__toString()}\n*/";
+                               $exceptions .= "/*\n{$e->__toString()}\n*/\n";
                        }
                }
 
@@ -393,12 +393,15 @@ class ResourceLoader {
                }
                
                // Generate a response
-               $response .= $this->makeModuleResponse( $context, $modules, $missing );
+               $response = $this->makeModuleResponse( $context, $modules, $missing );
+               
+               // Prepend comments indicating exceptions
+               $response = $exceptions . $response;
 
                // 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*/";
+                       $response = "/*\n$warnings\n*/\n" . $response;
                }
 
                // Remove the output buffer and output the response
@@ -420,18 +423,19 @@ class ResourceLoader {
                array $modules, $missing = array() ) 
        {
                $out = '';
+               $exceptions = '';
                if ( $modules === array() && $missing === array() ) {
                        return '/* No modules requested. Max made me put this here */';
                }
                
                // Pre-fetch blobs
                if ( $context->shouldIncludeMessages() ) {
-                       //try {
+                       try {
                                $blobs = MessageBlobStore::get( $this, $modules, $context->getLanguage() );
-                       //} catch ( Exception $e ) {
+                       } catch ( Exception $e ) {
                                // Add exception to the output as a comment
-                       //      $out .= "/*\n{$e->__toString()}\n*/";
-                       //}
+                               $exceptions .= "/*\n{$e->__toString()}\n*/\n";
+                       }
                } else {
                        $blobs = array();
                }
@@ -480,7 +484,7 @@ class ResourceLoader {
                                }
                        } catch ( Exception $e ) {
                                // Add exception to the output as a comment
-                               $out .= "/*\n{$e->__toString()}\n*/";
+                               $exceptions .= "/*\n{$e->__toString()}\n*/\n";
 
                                // Register module as missing
                                $missing[] = $name;
@@ -505,12 +509,12 @@ class ResourceLoader {
                }
 
                if ( $context->getDebug() ) {
-                       return $out;
+                       return $exceptions . $out;
                } else {
                        if ( $context->getOnly() === 'styles' ) {
-                               return $this->filter( 'minify-css', $out );
+                               return $exceptions . $this->filter( 'minify-css', $out );
                        } else {
-                               return $this->filter( 'minify-js', $out );
+                               return $exceptions . $this->filter( 'minify-js', $out );
                        }
                }
        }