Krinkle has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/366992 )
Change subject: Avoid deprecated ResourceLoaderGetLessVars hook
......................................................................
Avoid deprecated ResourceLoaderGetLessVars hook
Bug: T140804
Change-Id: I92671613e23314875ec34941305f6a6d7266b827
---
M extension.json
M includes/Hooks.php
A includes/XenForoResourceLoaderModule.php
3 files changed, 18 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/XenForoAuth
refs/changes/92/366992/1
diff --git a/extension.json b/extension.json
index 7a96e5c..155a660 100644
--- a/extension.json
+++ b/extension.json
@@ -20,7 +20,6 @@
"Hooks": {
"LoadExtensionSchemaUpdates":
"XenForoAuth\\Hooks::onLoadExtensionSchemaUpdates",
"AuthChangeFormFields":
"XenForoAuth\\Hooks::onAuthChangeFormFields",
- "ResourceLoaderGetLessVars":
"XenForoAuth\\Hooks::onResourceLoaderGetLessVars"
},
"AutoloadClasses": {
"XenForoAuth\\Auth\\XenForoPrimaryAuthenticationProvider":
"includes/auth/XenForoPrimaryAuthenticationProvider.php",
@@ -30,7 +29,8 @@
"XenForoAuth\\Auth\\XenForoUserInfoAuthenticationRequest":
"includes/auth/XenForoUserInfoAuthenticationRequest.php",
"XenForoAuth\\HTMLXenForoButtonField":
"includes/htmlform/HTMLXenForoButtonField.php",
"XenForoAuth\\XenForoUser": "includes/XenForoUser.php",
- "XenForoAuth\\Hooks": "includes/Hooks.php"
+ "XenForoAuth\\Hooks": "includes/Hooks.php",
+ "XenForoAuth\\XenForoResourceLoaderModule":
"includes/XenForoResourceLoaderModule.php"
},
"AuthManagerAutoConfig": {
"primaryauth": {
@@ -42,6 +42,7 @@
},
"ResourceModules": {
"ext.XenForo.userlogincreate.style": {
+ "class": "XenForoAuth\\XenForoResourceLoaderModule",
"styles": "style/ext.XenForo.userlogincreate.less",
"position": "top",
"targets": [
@@ -50,6 +51,7 @@
]
},
"ext.XenForo.userlogincreate.ooui.style": {
+ "class": "XenForoAuth\\XenForoResourceLoaderModule",
"styles": "style/ext.XenForo.userlogincreate.ooui.less",
"position": "top",
"targets": [
diff --git a/includes/Hooks.php b/includes/Hooks.php
index b389001..29549f3 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -46,19 +46,4 @@
unset( $formDescriptor['xenforoauth']['type'] );
}
}
-
- /**
- * ResourceLoaderGetLessVars hook handler
- *
- * @see
https://www.mediawiki.org/wiki/Manual:Hooks/ResourceLoaderGetLessVars
- * @param array &$lessVars Variables already added
- */
- public static function onResourceLoaderGetLessVars( &$lessVars ) {
- $config =
MediaWikiServices::getInstance()->getConfigFactory()->makeConfig( 'xenforoauth'
);
- $lessVars = array_merge( $lessVars,
- [
- 'wgXenForoAuthButtonIcon' => $config->get(
'XenForoAuthButtonIcon' )
- ]
- );
- }
}
diff --git a/includes/XenForoResourceLoaderModule.php
b/includes/XenForoResourceLoaderModule.php
new file mode 100644
index 0000000..e1d9a78
--- /dev/null
+++ b/includes/XenForoResourceLoaderModule.php
@@ -0,0 +1,14 @@
+<?php
+namespace XenForoAuth;
+
+class XenForoResourceLoaderModule extends \ResourceLoaderFileModule {
+ /**
+ * @param \ResourceLoaderContext $context
+ * @return array
+ */
+ protected function getLessVars( \ResourceLoaderContext $context ) {
+ $vars = parent::getLessVars( $context );
+ $vars['wgXenForoAuthButtonIcon'] = $this->getConfig()->get(
'XenForoAuthButtonIcon' );
+ return $vars;
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/366992
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I92671613e23314875ec34941305f6a6d7266b827
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/XenForoAuth
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
