Merge commit 'fa89acd'

# Conflicts:
#	.gitignore
#	extensions/ArchInterWiki.sql

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 ) {