jenkins-bot has submitted this change and it was merged.
Change subject: Fix config loading
......................................................................
Fix config loading
Change the ConfigRegistry setting in extension.json to the normal
GlobalVarConfig factor rather than a local wrapper.
Change-Id: I9a1b2869ee13fab59f628e4d5c83188a96062c42
---
M TemplateStyles.hooks.php
M extension.json
2 files changed, 2 insertions(+), 6 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/TemplateStyles.hooks.php b/TemplateStyles.hooks.php
index 375ccc8..c200975 100644
--- a/TemplateStyles.hooks.php
+++ b/TemplateStyles.hooks.php
@@ -25,10 +25,6 @@
return true;
}
- public static function makeConfig() {
- return new GlobalVarConfig( 'TemplateStyles' );
- }
-
private static function decodeFromBlob( $blob ) {
$tree = gzdecode( $blob );
if ( $tree ) {
@@ -43,7 +39,7 @@
public static function onOutputPageParserOutput( &$out, $parseroutput )
{
- $config = ConfigFactory::getDefaultInstance()->makeConfig(
'TemplateStyles' );
+ $config = ConfigFactory::getDefaultInstance()->makeConfig(
'templatestyles' );
$renderer = new CSSRenderer();
$pages = [];
diff --git a/extension.json b/extension.json
index 03ab87a..bdaaf9f 100644
--- a/extension.json
+++ b/extension.json
@@ -56,7 +56,7 @@
}
},
"ConfigRegistry": {
- "TemplateStyles": "TemplateStylesHooks::makeConfig"
+ "templatestyles": "GlobalVarConfig::newInstance"
}
}
--
To view, visit https://gerrit.wikimedia.org/r/284755
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9a1b2869ee13fab59f628e4d5c83188a96062c42
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateStyles
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
