Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resourceloader: Avoid deprecated getModifiedHash() in SkinModule

Browse source 
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
This commit is contained in:
Timo Tijhof 2017-03-28 14:34:18 -07:00 committed by Paladox
parent 5c68ea56aa
commit 20b445e22f
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
includes/resourceloader/ResourceLoaderSkinModule.php
View file

@ -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;
}
}