From b7c7bd3c955a5e8f9c613d777222ed197f0c3c7a Mon Sep 17 00:00:00 2001
From: Chad Horohoe <demon@users.mediawiki.org>
Date: Wed, 29 Jun 2011 00:08:25 +0000
Subject: [PATCH] (bug 29277) MediaWiki:Filepage.css not loaded on foreignwiki
 itself. Fixup to r68904. Yay Roan finally taught me how to use the
 resourceloader :D

---
 RELEASE-NOTES-1.19                               |  1 +
 includes/AutoLoader.php                          |  1 +
 includes/ImagePage.php                           | 16 ++++++++++++----
 .../ResourceLoaderFilePageModule.php             | 11 +++++++++++
 resources/Resources.php                          |  1 +
 5 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 includes/resourceloader/ResourceLoaderFilePageModule.php

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index 21e7fabca2..6eaac8fa67 100644
--- a/RELEASE-NOTES-1.19
+++ b/RELEASE-NOTES-1.19
@@ -129,6 +129,7 @@ production.
   namespaces (categories) when combined with $wgRawHtml.
 * Use content language in formatting of dates in revertpage message
   (rollback revert edit summary) and do not adjust for user timezone.
+* (bug 29277) MediaWiki:Filepage.css is also shown on the local wiki
 
 === API changes in 1.19 ===
 * BREAKING CHANGE: action=watch now requires POST and token.
diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index ac1f6844ad..d11ff23823 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -635,6 +635,7 @@ $wgAutoloadLocalClasses = array(
 	'ResourceLoader' => 'includes/resourceloader/ResourceLoader.php',
 	'ResourceLoaderContext' => 'includes/resourceloader/ResourceLoaderContext.php',
 	'ResourceLoaderFileModule' => 'includes/resourceloader/ResourceLoaderFileModule.php',
+	'ResourceLoaderFilePageModule' => 'includes/resourceloader/ResourceLoaderFilePageModule.php',
 	'ResourceLoaderModule' => 'includes/resourceloader/ResourceLoaderModule.php',
 	'ResourceLoaderNoscriptModule' => 'includes/resourceloader/ResourceLoaderNoscriptModule.php',
 	'ResourceLoaderSiteModule' => 'includes/resourceloader/ResourceLoaderSiteModule.php',
diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 8d50df6e13..d097afad22 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -12,6 +12,9 @@ class ImagePage extends Article {
 	 */
 	private $img;
 	private $displayImg;
+	/**
+	 * @var FileRepo
+	 */
 	private $repo;
 	private $fileLoaded;
 
@@ -161,11 +164,16 @@ class ImagePage extends Article {
 			$wgOut->addWikiText( $this->makeMetadataTable( $formattedMetadata ) );
 			$wgOut->addModules( array( 'mediawiki.action.view.metadata' ) );
 		}
-		
-		$css = $this->repo->getDescriptionStylesheetUrl();
-		if ( $css ) {
-			$wgOut->addStyle( $css );
+
+		// Add remote Filepage.css
+		if( !$this->repo->isLocal() ) {
+			$css = $this->repo->getDescriptionStylesheetUrl();
+			if ( $css ) {
+				$wgOut->addStyle( $css );
+			}
 		}
+		// always show the local local Filepage.css, bug 29277
+		$wgOut->addModuleStyles( 'filepage' );
 	}
 	
 	public function getRedirectTarget() {
diff --git a/includes/resourceloader/ResourceLoaderFilePageModule.php b/includes/resourceloader/ResourceLoaderFilePageModule.php
new file mode 100644
index 0000000000..fc9aef1bed
--- /dev/null
+++ b/includes/resourceloader/ResourceLoaderFilePageModule.php
@@ -0,0 +1,11 @@
+<?php
+/* 
+ * ResourceLoader definition for MediaWiki:Filepage.css
+ */
+class ResourceLoaderFilePageModule extends ResourceLoaderWikiModule {
+	protected function getPages( ResourceLoaderContext $context ) {
+		return array(
+			'MediaWiki:Filepage.css' => array( 'type' => 'style' ),
+		);
+	}
+}
diff --git a/resources/Resources.php b/resources/Resources.php
index 877d9c4523..24e121b1d5 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -11,6 +11,7 @@ return array(
 	'user.groups' => array( 'class' => 'ResourceLoaderUserGroupsModule' ),
 	'user.options' => array( 'class' => 'ResourceLoaderUserOptionsModule' ),
 	'user.tokens' => array( 'class' => 'ResourceLoaderUserTokensModule' ),
+	'filepage' => array( 'class' => 'ResourceLoaderFilePageModule' ),
 
 	/* Skins */
 
-- 
2.20.1