jenkins-bot has submitted this change and it was merged.
Change subject: Use ResourceLoader::isModuleRegistered()
......................................................................
Use ResourceLoader::isModuleRegistered()
Change-Id: I91319d2d975620b047e7be933aba257f28eb7201
---
M TemplateData.hooks.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/TemplateData.hooks.php b/TemplateData.hooks.php
index 3d1d6dd..27398c1 100644
--- a/TemplateData.hooks.php
+++ b/TemplateData.hooks.php
@@ -8,7 +8,7 @@
class TemplateDataHooks {
public static function onSetup() {
- wfUseMW( '1.22wmf18' );
+ wfUseMW( '1.25wmf22' );
}
/**
@@ -54,7 +54,7 @@
public static function onResourceLoaderRegisterModules( ResourceLoader
&$resourceLoader ) {
$resourceModules = $resourceLoader->getConfig()->get(
'ResourceModules' );
$name = 'jquery.uls.data';
- if ( !isset( $resourceModules[$name] ) &&
!$resourceLoader->getModule( $name ) ) {
+ if ( !isset( $resourceModules[$name] ) &&
!$resourceLoader->isModuleRegistered( $name ) ) {
$resourceLoader->register( array(
'jquery.uls.data' => array(
'localBasePath' => __DIR__,
--
To view, visit https://gerrit.wikimedia.org/r/196970
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I91319d2d975620b047e7be933aba257f28eb7201
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateData
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
