diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2015-12-20 09:00:55 +0100 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2015-12-20 09:00:55 +0100 |
commit | a2190ac74dd4d7080b12bab90e552d7aa81209ef (patch) | |
tree | 8b31f38de9882d18df54cf8d9e0de74167a094eb /includes/resourceloader/ResourceLoaderSkinModule.php | |
parent | 15e69f7b20b6596b9148030acce5b59993b95a45 (diff) | |
parent | 257401d8b2cf661adf36c84b0e3fd1cf85e33c22 (diff) |
Merge branch 'mw-1.26'
Diffstat (limited to 'includes/resourceloader/ResourceLoaderSkinModule.php')
-rw-r--r-- | includes/resourceloader/ResourceLoaderSkinModule.php | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/includes/resourceloader/ResourceLoaderSkinModule.php b/includes/resourceloader/ResourceLoaderSkinModule.php index 3ba63e68..911d9534 100644 --- a/includes/resourceloader/ResourceLoaderSkinModule.php +++ b/includes/resourceloader/ResourceLoaderSkinModule.php @@ -44,13 +44,13 @@ class ResourceLoaderSkinModule extends ResourceLoaderFileModule { '(min-resolution: 1.5dppx), ' . '(min-resolution: 144dpi)' ][] = '.mw-wiki-logo { background-image: ' . - CSSMin::buildUrlValue( $logoHD['1.5x'] ) .';' . + CSSMin::buildUrlValue( $logoHD['1.5x'] ) . ';' . 'background-size: 135px auto; }'; } if ( isset( $logoHD['2x'] ) ) { $styles[ '(-webkit-min-device-pixel-ratio: 2), ' . - '(min--moz-device-pixel-ratio: 2),'. + '(min--moz-device-pixel-ratio: 2),' . '(min-resolution: 2dppx), ' . '(min-resolution: 192dpi)' ][] = '.mw-wiki-logo { background-image: ' . @@ -73,15 +73,6 @@ class ResourceLoaderSkinModule extends ResourceLoaderFileModule { /** * @param $context ResourceLoaderContext - * @return int|mixed - */ - public function getModifiedTime( ResourceLoaderContext $context ) { - $parentMTime = parent::getModifiedTime( $context ); - return max( $parentMTime, $this->getHashMtime( $context ) ); - } - - /** - * @param $context ResourceLoaderContext * @return string: Hash */ public function getModifiedHash( ResourceLoaderContext $context ) { |