http://www.mediawiki.org/wiki/Special:Code/MediaWiki/91036
Revision: 91036
Author: demon
Date: 2011-06-29 00:37:23 +0000 (Wed, 29 Jun 2011)
Log Message:
-----------
MFT r91031: filepage.css fixes
Modified Paths:
--------------
branches/wmf/1.17wmf1/includes/AutoLoader.php
branches/wmf/1.17wmf1/includes/ImagePage.php
branches/wmf/1.17wmf1/resources/Resources.php
Added Paths:
-----------
branches/wmf/1.17wmf1/includes/resourceloader/ResourceLoaderFilePageModule.php
Property Changed:
----------------
branches/wmf/1.17wmf1/includes/AutoLoader.php
branches/wmf/1.17wmf1/includes/ImagePage.php
branches/wmf/1.17wmf1/includes/resourceloader/
branches/wmf/1.17wmf1/resources/Resources.php
Modified: branches/wmf/1.17wmf1/includes/AutoLoader.php
===================================================================
--- branches/wmf/1.17wmf1/includes/AutoLoader.php 2011-06-29 00:26:49 UTC
(rev 91035)
+++ branches/wmf/1.17wmf1/includes/AutoLoader.php 2011-06-29 00:37:23 UTC
(rev 91036)
@@ -196,6 +196,7 @@
'ResourceLoaderModule' =>
'includes/resourceloader/ResourceLoaderModule.php',
'ResourceLoaderWikiModule' =>
'includes/resourceloader/ResourceLoaderWikiModule.php',
'ResourceLoaderFileModule' =>
'includes/resourceloader/ResourceLoaderFileModule.php',
+ 'ResourceLoaderFilePageModule' =>
'includes/resourceloader/ResourceLoaderFilePageModule.php',
'ResourceLoaderSiteModule' =>
'includes/resourceloader/ResourceLoaderSiteModule.php',
'ResourceLoaderUserModule' =>
'includes/resourceloader/ResourceLoaderUserModule.php',
'ResourceLoaderUserOptionsModule' =>
'includes/resourceloader/ResourceLoaderUserOptionsModule.php',
Property changes on: branches/wmf/1.17wmf1/includes/AutoLoader.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/AutoLoader.php:51646
/branches/new-installer/phase3/includes/AutoLoader.php:43664-66004
/branches/sqlite/includes/AutoLoader.php:58211-58321
/branches/uploadwizard/phase3/includes/AutoLoader.php:73550-75905
/branches/wmf/1.16wmf4/includes/AutoLoader.php:67177,69199,76243,77266
/branches/wmf-deployment/includes/AutoLoader.php:53381,60970
/trunk/phase3/includes/AutoLoader.php:77981-77982,77994,78097,78118-78119,78137,78141,78165,78192,78204,78209,78230,78246,78250-78251,78264,78276,78404,78424,79828,79830,79848,79853,79915,79950-79951,79954,79957,79964,79989-79990,80006-80007,80013,80016,80080,80083,80109,80113,80124,80128,80223,80238,80432,80443,80475,80554,80575,80590,80614-80616,80620,80656,80666,80687,80999,81006,81011,81101,81105,81138,81141,81146,81149-81150,81166,81171,81186-81187,81197,81209-81211,81215,81238,81246,81262,81264,81692,82468,83135-83136,83140,83143,83147,83208,83416,83492,83814,83885,83891,83897,83902-83903,83988-83989,83997-83998,84392,85377,85555,85583,86100,86121,86130,86142,86146,86183,86210
+ /branches/REL1_15/phase3/includes/AutoLoader.php:51646
/branches/new-installer/phase3/includes/AutoLoader.php:43664-66004
/branches/sqlite/includes/AutoLoader.php:58211-58321
/branches/uploadwizard/phase3/includes/AutoLoader.php:73550-75905
/branches/wmf/1.16wmf4/includes/AutoLoader.php:67177,69199,76243,77266
/branches/wmf-deployment/includes/AutoLoader.php:53381,60970
/trunk/phase3/includes/AutoLoader.php:77981-77982,77994,78097,78118-78119,78137,78141,78165,78192,78204,78209,78230,78246,78250-78251,78264,78276,78404,78424,79828,79830,79848,79853,79915,79950-79951,79954,79957,79964,79989-79990,80006-80007,80013,80016,80080,80083,80109,80113,80124,80128,80223,80238,80432,80443,80475,80554,80575,80590,80614-80616,80620,80656,80666,80687,80999,81006,81011,81101,81105,81138,81141,81146,81149-81150,81166,81171,81186-81187,81197,81209-81211,81215,81238,81246,81262,81264,81692,82468,83135-83136,83140,83143,83147,83208,83416,83492,83814,83885,83891,83897,83902-83903,83988-83989,83997-83998,84392,85377,85555,85583,86100,86121,86130,86142,86146,86183,86210,91031
Modified: branches/wmf/1.17wmf1/includes/ImagePage.php
===================================================================
--- branches/wmf/1.17wmf1/includes/ImagePage.php 2011-06-29 00:26:49 UTC
(rev 91035)
+++ branches/wmf/1.17wmf1/includes/ImagePage.php 2011-06-29 00:37:23 UTC
(rev 91036)
@@ -151,11 +151,16 @@
$wgOut->addWikiText( $this->makeMetadataTable(
$formattedMetadata ) );
$wgOut->addModules( array( 'mediawiki.legacy.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() {
Property changes on: branches/wmf/1.17wmf1/includes/ImagePage.php
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/includes/ImagePage.php:51646
/branches/new-installer/phase3/includes/ImagePage.php:43664-66004
/branches/sqlite/includes/ImagePage.php:58211-58321
/branches/wmf/1.16wmf4/includes/ImagePage.php:67177,69199,76243,77266
/branches/wmf-deployment/includes/ImagePage.php:53381,60970
/trunk/phase3/includes/ImagePage.php:83590,89512-89513,91031
Property changes on: branches/wmf/1.17wmf1/includes/resourceloader
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/includes/resourceloader:51646
/branches/new-installer/phase3/includes/resourceloader:43664-66004
/branches/sqlite/includes/resourceloader:58211-58321
/branches/wmf/1.16wmf4/includes/resourceloader:67177,69199,76243,77266
/branches/wmf-deployment/includes/resourceloader:53381,60970
/trunk/phase3/includes/resourceloader:83590,89512-89513,91031
Copied:
branches/wmf/1.17wmf1/includes/resourceloader/ResourceLoaderFilePageModule.php
(from rev 91031,
trunk/phase3/includes/resourceloader/ResourceLoaderFilePageModule.php)
===================================================================
---
branches/wmf/1.17wmf1/includes/resourceloader/ResourceLoaderFilePageModule.php
(rev 0)
+++
branches/wmf/1.17wmf1/includes/resourceloader/ResourceLoaderFilePageModule.php
2011-06-29 00:37:23 UTC (rev 91036)
@@ -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' ),
+ );
+ }
+}
Modified: branches/wmf/1.17wmf1/resources/Resources.php
===================================================================
--- branches/wmf/1.17wmf1/resources/Resources.php 2011-06-29 00:26:49 UTC
(rev 91035)
+++ branches/wmf/1.17wmf1/resources/Resources.php 2011-06-29 00:37:23 UTC
(rev 91036)
@@ -8,6 +8,7 @@
'startup' => array( 'class' => 'ResourceLoaderStartUpModule' ),
'user' => array( 'class' => 'ResourceLoaderUserModule' ),
'user.options' => array( 'class' => 'ResourceLoaderUserOptionsModule' ),
+ 'filepage' => array( 'class' => 'ResourceLoaderFilePageModule' ),
/* Skins */
Property changes on: branches/wmf/1.17wmf1/resources/Resources.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/resources/Resources.php:51646
/branches/new-installer/phase3/resources/Resources.php:43664-66004
/branches/sqlite/resources/Resources.php:58211-58321
/branches/wmf/1.16wmf4/resources/Resources.php:67177,69199,76243,77266
/branches/wmf-deployment/resources/Resources.php:60970
/trunk/phase3/resources/Resources.php:79828,79830,79848,79853,79950-79951,79954,79989,80006-80007,80013,80016,80080,80083,80124,80128,80238,80495,80765,81177,81719,82000,82155-82156,82191,82200,82203,82218,86577,86579,86657,87472
+ /branches/REL1_15/phase3/resources/Resources.php:51646
/branches/new-installer/phase3/resources/Resources.php:43664-66004
/branches/sqlite/resources/Resources.php:58211-58321
/branches/wmf/1.16wmf4/resources/Resources.php:67177,69199,76243,77266
/branches/wmf-deployment/resources/Resources.php:60970
/trunk/phase3/resources/Resources.php:79828,79830,79848,79853,79950-79951,79954,79989,80006-80007,80013,80016,80080,80083,80124,80128,80238,80495,80765,81177,81719,82000,82155-82156,82191,82200,82203,82218,86577,86579,86657,87472,91031
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
