X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fresourceloader%2FResourceLoaderSkinModule.php;h=7d37944f0ee6c1ed93111819fb58e6a6627195b9;hb=5f55e9c9c2a2416604c6b71a345353b73a960c50;hp=e1df6d95740cd667394fc85fb2a7f28b571a4229;hpb=04fdc78370dbc042116488d6826e19bf3910273b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/resourceloader/ResourceLoaderSkinModule.php b/includes/resourceloader/ResourceLoaderSkinModule.php
index e1df6d9574..7d37944f0e 100644
--- a/includes/resourceloader/ResourceLoaderSkinModule.php
+++ b/includes/resourceloader/ResourceLoaderSkinModule.php
@@ -23,19 +23,25 @@
 
 class ResourceLoaderSkinModule extends ResourceLoaderFileModule {
 
-	/* Methods */
-
 	/**
-	 * @param $context ResourceLoaderContext
+	 * @param ResourceLoaderContext $context
 	 * @return array
 	 */
 	public function getStyles( ResourceLoaderContext $context ) {
-		$logo = $this->getConfig()->get( 'Logo' );
-		$logoHD = $this->getConfig()->get( 'LogoHD' );
+		$conf = $this->getConfig();
+		$logo = $conf->get( 'Logo' );
+		$logoHD = $conf->get( 'LogoHD' );
+
+		$logo1 = OutputPage::transformResourcePath( $conf, $logo );
+		$logo15 = OutputPage::transformResourcePath( $conf, $logoHD['1.5x'] );
+		$logo2 = OutputPage::transformResourcePath( $conf, $logoHD['2x'] );
+
 		$styles = parent::getStyles( $context );
 		$styles['all'][] = '.mw-wiki-logo { background-image: ' .
-			CSSMin::buildUrlValue( $logo ) .
+			CSSMin::buildUrlValue( $logo1 ) .
 			'; }';
+		// Only 1.5x and 2x are supported
+		// Note: Keep in sync with OutputPage::addLogoPreloadLinkHeaders()
 		if ( $logoHD ) {
 			if ( isset( $logoHD['1.5x'] ) ) {
 				$styles[
@@ -44,7 +50,7 @@ class ResourceLoaderSkinModule extends ResourceLoaderFileModule {
 					'(min-resolution: 1.5dppx), ' .
 					'(min-resolution: 144dpi)'
 				][] = '.mw-wiki-logo { background-image: ' .
-				CSSMin::buildUrlValue( $logoHD['1.5x'] ) . ';' .
+				CSSMin::buildUrlValue( $logo15 ) . ';' .
 				'background-size: 135px auto; }';
 			}
 			if ( isset( $logoHD['2x'] ) ) {
@@ -54,7 +60,7 @@ class ResourceLoaderSkinModule extends ResourceLoaderFileModule {
 					'(min-resolution: 2dppx), ' .
 					'(min-resolution: 192dpi)'
 				][] = '.mw-wiki-logo { background-image: ' .
-				CSSMin::buildUrlValue( $logoHD['2x'] ) . ';' .
+				CSSMin::buildUrlValue( $logo2 ) . ';' .
 				'background-size: 135px auto; }';
 			}
 		}
@@ -62,7 +68,7 @@ class ResourceLoaderSkinModule extends ResourceLoaderFileModule {
 	}
 
 	/**
-	 * @param $context ResourceLoaderContext
+	 * @param ResourceLoaderContext $context
 	 * @return bool
 	 */
 	public function isKnownEmpty( ResourceLoaderContext $context ) {
@@ -71,13 +77,12 @@ class ResourceLoaderSkinModule extends ResourceLoaderFileModule {
 		return false;
 	}
 
-	/**
-	 * @param $context ResourceLoaderContext
-	 * @return string: Hash
-	 */
-	public function getModifiedHash( ResourceLoaderContext $context ) {
-		$logo = $this->getConfig()->get( 'Logo' );
-		$logoHD = $this->getConfig()->get( 'LogoHD' );
-		return md5( parent::getModifiedHash( $context ) . $logo . json_encode( $logoHD ) );
+	public function getDefinitionSummary( ResourceLoaderContext $context ) {
+		$summary = parent::getDefinitionSummary( $context );
+		$summary[] = [
+			'logo' => $this->getConfig()->get( 'Logo' ),
+			'logoHD' => $this->getConfig()->get( 'LogoHD' ),
+		];
+		return $summary;
 	}
 }