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

diff --git a/includes/resourceloader/ResourceLoaderSkinModule.php b/includes/resourceloader/ResourceLoaderSkinModule.php
index 490a4ab24d..7d37944f0e 100644
--- a/includes/resourceloader/ResourceLoaderSkinModule.php
+++ b/includes/resourceloader/ResourceLoaderSkinModule.php
@@ -23,10 +23,8 @@
 
 class ResourceLoaderSkinModule extends ResourceLoaderFileModule {
 
-	/* Methods */
-
 	/**
-	 * @param $context ResourceLoaderContext
+	 * @param ResourceLoaderContext $context
 	 * @return array
 	 */
 	public function getStyles( ResourceLoaderContext $context ) {
@@ -42,6 +40,8 @@ class ResourceLoaderSkinModule extends ResourceLoaderFileModule {
 		$styles['all'][] = '.mw-wiki-logo { background-image: ' .
 			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[
@@ -68,7 +68,7 @@ class ResourceLoaderSkinModule extends ResourceLoaderFileModule {
 	}
 
 	/**
-	 * @param $context ResourceLoaderContext
+	 * @param ResourceLoaderContext $context
 	 * @return bool
 	 */
 	public function isKnownEmpty( ResourceLoaderContext $context ) {
@@ -77,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;
 	}
 }