| Index: branches/wmf/1.17wmf1/includes/ImagePage.php |
| — | — | @@ -151,11 +151,16 @@ |
| 152 | 152 | $wgOut->addWikiText( $this->makeMetadataTable( $formattedMetadata ) ); |
| 153 | 153 | $wgOut->addModules( array( 'mediawiki.legacy.metadata' ) ); |
| 154 | 154 | } |
| 155 | | - |
| 156 | | - $css = $this->repo->getDescriptionStylesheetUrl(); |
| 157 | | - if ( $css ) { |
| 158 | | - $wgOut->addStyle( $css ); |
| | 155 | + |
| | 156 | + // Add remote Filepage.css |
| | 157 | + if( !$this->repo->isLocal() ) { |
| | 158 | + $css = $this->repo->getDescriptionStylesheetUrl(); |
| | 159 | + if ( $css ) { |
| | 160 | + $wgOut->addStyle( $css ); |
| | 161 | + } |
| 159 | 162 | } |
| | 163 | + // always show the local local Filepage.css, bug 29277 |
| | 164 | + $wgOut->addModuleStyles( 'filepage' ); |
| 160 | 165 | } |
| 161 | 166 | |
| 162 | 167 | public function getRedirectTarget() { |
| Property changes on: branches/wmf/1.17wmf1/includes/ImagePage.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 163 | 168 | Merged /branches/sqlite/includes/ImagePage.php:r58211-58321 |
| 164 | 169 | Merged /trunk/phase3/includes/ImagePage.php:r83590,89512-89513,91031 |
| 165 | 170 | Merged /branches/new-installer/phase3/includes/ImagePage.php:r43664-66004 |
| 166 | 171 | Merged /branches/wmf-deployment/includes/ImagePage.php:r53381,60970 |
| 167 | 172 | Merged /branches/REL1_15/phase3/includes/ImagePage.php:r51646 |
| 168 | 173 | Merged /branches/wmf/1.16wmf4/includes/ImagePage.php:r67177,69199,76243,77266 |
| Index: branches/wmf/1.17wmf1/includes/resourceloader/ResourceLoaderFilePageModule.php |
| — | — | @@ -0,0 +1,11 @@ |
| | 2 | +<?php |
| | 3 | +/* |
| | 4 | + * ResourceLoader definition for MediaWiki:Filepage.css |
| | 5 | + */ |
| | 6 | +class ResourceLoaderFilePageModule extends ResourceLoaderWikiModule { |
| | 7 | + protected function getPages( ResourceLoaderContext $context ) { |
| | 8 | + return array( |
| | 9 | + 'MediaWiki:Filepage.css' => array( 'type' => 'style' ), |
| | 10 | + ); |
| | 11 | + } |
| | 12 | +} |
| Property changes on: branches/wmf/1.17wmf1/includes/resourceloader/ResourceLoaderFilePageModule.php |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 13 | + native |
| Property changes on: branches/wmf/1.17wmf1/includes/resourceloader |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 2 | 14 | Merged /branches/new-installer/phase3/includes/resourceloader:r43664-66004 |
| 3 | 15 | Merged /branches/wmf-deployment/includes/resourceloader:r53381,60970 |
| 4 | 16 | Merged /branches/REL1_15/phase3/includes/resourceloader:r51646 |
| 5 | 17 | Merged /branches/wmf/1.16wmf4/includes/resourceloader:r67177,69199,76243,77266 |
| 6 | 18 | Merged /branches/sqlite/includes/resourceloader:r58211-58321 |
| 7 | 19 | Merged /trunk/phase3/includes/resourceloader:r83590,89512-89513,91031 |
| Index: branches/wmf/1.17wmf1/includes/AutoLoader.php |
| — | — | @@ -196,6 +196,7 @@ |
| 197 | 197 | 'ResourceLoaderModule' => 'includes/resourceloader/ResourceLoaderModule.php', |
| 198 | 198 | 'ResourceLoaderWikiModule' => 'includes/resourceloader/ResourceLoaderWikiModule.php', |
| 199 | 199 | 'ResourceLoaderFileModule' => 'includes/resourceloader/ResourceLoaderFileModule.php', |
| | 200 | + 'ResourceLoaderFilePageModule' => 'includes/resourceloader/ResourceLoaderFilePageModule.php', |
| 200 | 201 | 'ResourceLoaderSiteModule' => 'includes/resourceloader/ResourceLoaderSiteModule.php', |
| 201 | 202 | 'ResourceLoaderUserModule' => 'includes/resourceloader/ResourceLoaderUserModule.php', |
| 202 | 203 | 'ResourceLoaderUserOptionsModule' => 'includes/resourceloader/ResourceLoaderUserOptionsModule.php', |
| Property changes on: branches/wmf/1.17wmf1/includes/AutoLoader.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 203 | 204 | Merged /trunk/phase3/includes/AutoLoader.php:r91031 |
| Index: branches/wmf/1.17wmf1/resources/Resources.php |
| — | — | @@ -8,6 +8,7 @@ |
| 9 | 9 | 'startup' => array( 'class' => 'ResourceLoaderStartUpModule' ), |
| 10 | 10 | 'user' => array( 'class' => 'ResourceLoaderUserModule' ), |
| 11 | 11 | 'user.options' => array( 'class' => 'ResourceLoaderUserOptionsModule' ), |
| | 12 | + 'filepage' => array( 'class' => 'ResourceLoaderFilePageModule' ), |
| 12 | 13 | |
| 13 | 14 | /* Skins */ |
| 14 | 15 | |
| Property changes on: branches/wmf/1.17wmf1/resources/Resources.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 15 | 16 | Merged /trunk/phase3/resources/Resources.php:r91031 |