From: Timo Tijhof <krinklemail@gmail.com>
Date: Tue, 28 Mar 2017 21:34:18 +0000 (-0700)
Subject: resourceloader: Avoid deprecated getModifiedHash() in SkinModule
X-Git-Tag: 1.31.0-rc.0~3679
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=20b445e22f236e3deb5249021126021fe396f382

resourceloader: Avoid deprecated getModifiedHash() in SkinModule

Use getDefinitionSummary instead, which uses a single serialisation
pass instead of requiring every stage to be a string. This way
we don't need to call json_encode and md5() multiple times.

getModifiedHash() was deprecated in MediaWiki 1.26.

Change-Id: If9e9caa3d12976c99543ad53ab280355b70acb17
---

diff --git a/includes/resourceloader/ResourceLoaderSkinModule.php b/includes/resourceloader/ResourceLoaderSkinModule.php
index 91e63e70aa..d72b3afaf5 100644
--- a/includes/resourceloader/ResourceLoaderSkinModule.php
+++ b/includes/resourceloader/ResourceLoaderSkinModule.php
@@ -23,8 +23,6 @@
 
 class ResourceLoaderSkinModule extends ResourceLoaderFileModule {
 
-	/* Methods */
-
 	/**
 	 * @param ResourceLoaderContext $context
 	 * @return array
@@ -77,13 +75,12 @@ class ResourceLoaderSkinModule extends ResourceLoaderFileModule {
 		return false;
 	}
 
-	/**
-	 * @param ResourceLoaderContext $context
-	 * @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;
 	}
 }