From a1789ddde42033f1b05cc4929491214ee6e79383 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Thu, 17 Dec 2015 09:15:42 +0100 Subject: Update to MediaWiki 1.26.0 --- includes/resourceloader/ResourceLoaderSkinModule.php | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'includes/resourceloader/ResourceLoaderSkinModule.php') 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: ' . @@ -71,15 +71,6 @@ class ResourceLoaderSkinModule extends ResourceLoaderFileModule { return false; } - /** - * @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 -- cgit v1.2.3-54-g00ecf