Reverts r75018, and does what that commit was supposed to do.

diff --git a/includes/ResourceLoader.php b/includes/ResourceLoader.php
index 1d4a202..cda10d2 100644 (file)
--- a/includes/ResourceLoader.php
+++ b/includes/ResourceLoader.php
@@ -301,6 +301,9 @@ class ResourceLoader {
                }
 
                $response = $this->makeModuleResponse( $context, $modules, $missing );
+               if ( $context->getDebug() && strlen( $warnings = ob_get_contents() ) ) {
+                       $response .= "/*\n$warnings\n*/";
+               }
                // Clear any warnings from the buffer
                ob_clean();
                echo $response;

diff --git a/resources/Resources.php b/resources/Resources.php
index 962ab83..1ca2c40 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -11,9 +11,6 @@ return array(
        
        /* Skins */
        
-       'vector2e2e2' => new ResourceLoaderFileModule(
-               array( 'styles' => array( 'skins/vector/screen2e2e2.css' => array( 'media' => 'screen' ) ) )
-       ),
        'vector' => new ResourceLoaderFileModule(
                array( 'styles' => array( 'skins/vector/screen.css' => array( 'media' => 'screen' ) ) )
        ),