From: Trevor Parscal <tparscal@users.mediawiki.org>
Date: Tue, 19 Oct 2010 17:52:01 +0000 (+0000)
Subject: Reverts r75018, and does what that commit was supposed to do.
X-Git-Tag: 1.31.0-rc.0~34425
X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=967806a16a4ed9453b16544b1ea37b67c9b83be1;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/includes/ResourceLoader.php b/includes/ResourceLoader.php
index 1d4a202229..cda10d29bd 100644
--- 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 962ab8311a..1ca2c40def 100644
--- 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' ) ) )
 	),