jenkins-bot has submitted this change and it was merged.
Change subject: Add $wgGadgetsEnableLegacyGadgets to allow disabling of legacy
gadgets
......................................................................
Add $wgGadgetsEnableLegacyGadgets to allow disabling of legacy gadgets
Follows-up 192d37b19a4.
So we can turn them off in preparation of Gadgets 2.0, which
doesn't support them at all.
Change-Id: I98b4146579ccbbfcad8b83a51cc095da1fad673c
---
M GadgetHooks.php
M extension.json
2 files changed, 9 insertions(+), 3 deletions(-)
Approvals:
Paladox: Looks good to me, but someone else must approve
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/GadgetHooks.php b/GadgetHooks.php
index efec80a..2502a37 100644
--- a/GadgetHooks.php
+++ b/GadgetHooks.php
@@ -162,6 +162,8 @@
* @return bool
*/
public static function beforePageDisplay( $out ) {
+ global $wgGadgetsEnableLegacyGadgets;
+
$gadgets = Gadget::loadList();
if ( !$gadgets ) {
return true;
@@ -189,8 +191,11 @@
}
}
- // Allow other extensions, e.g. MobileFrontend, to disallow
legacy gadgets
- if ( Hooks::run( 'Gadgets::allowLegacy', array(
$out->getContext() ) ) ) {
+ // Check if legacy gadgets are even enabled
+ if ( $wgGadgetsEnableLegacyGadgets &&
+ // Allow other extensions, e.g. MobileFrontend, to
disallow legacy gadgets
+ Hooks::run( 'Gadgets::allowLegacy', array(
$out->getContext() ) )
+ ) {
$lb->execute( __METHOD__ );
$done = array();
diff --git a/extension.json b/extension.json
index 1e1e2b7..2a39601 100644
--- a/extension.json
+++ b/extension.json
@@ -56,7 +56,8 @@
},
"config": {
"GadgetsCaching": true,
- "GadgetsCacheType": false
+ "GadgetsCacheType": false,
+ "GadgetsEnableLegacyGadgets": true
},
"manifest_version": 1
}
--
To view, visit https://gerrit.wikimedia.org/r/166363
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I98b4146579ccbbfcad8b83a51cc095da1fad673c
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/Gadgets
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Alex Monk <kren...@gmail.com>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
