jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/345642 )
Change subject: Remove hard dependency on BetaFeatures
......................................................................
Remove hard dependency on BetaFeatures
Also fix typos in config file.
Bug: T161829
Change-Id: I91fd695ab9d2e4b142c67884f5e8c83f3142d240
---
M extension.json
M includes/PopupsContext.php
2 files changed, 9 insertions(+), 5 deletions(-)
Approvals:
Prtksxna: Looks good to me, but someone else must approve
jenkins-bot: Verified
Phuedx: Looks good to me, approved
diff --git a/extension.json b/extension.json
index 6814ab0..6abe7c1 100644
--- a/extension.json
+++ b/extension.json
@@ -52,10 +52,10 @@
"PopupsBetaFeature": false,
"@PopupsSchemaSamplingRate": "@var number: Sample rate for
logging events to Schema:Popups.",
"PopupsSchemaSamplingRate": 0,
- "@PopupsHideOptInOnPreferencesPage": "@var bool: Whether the
option to senable/disable Page Previews should be hidden on Preferences page.
Please note if PopupsBetaFeature is set to true this option will be always
hidden. False by default",
+ "@PopupsHideOptInOnPreferencesPage": "@var bool: Whether the
option to enable/disable Page Previews should be hidden on Preferences page.
Please note if PopupsBetaFeature is set to true this option will be always
hidden. False by default",
"PopupsHideOptInOnPreferencesPage": false,
- "@PopupsOptInDefaultState" : "@var string:['1'|'0'] Default
Page Previews visibility. Has to be a string as a compatibility with beta
feature settings",
- "PopupsOptInDefaultState" : "0",
+ "@PopupsOptInDefaultState": "@var string:['1'|'0'] Default Page
Previews visibility. Has to be a string as a compatibility with beta feature
settings",
+ "PopupsOptInDefaultState": "0",
"@PopupsConflictingNavPopupsGadgetName": "@var string:
Navigation popups gadget name",
"PopupsConflictingNavPopupsGadgetName": "Navigation_popups",
"@PopupsAPIUseRESTBase": "Whether to use RESTBase rather than
the MediaWiki API for fetching Popups data.",
diff --git a/includes/PopupsContext.php b/includes/PopupsContext.php
index 6491759..c712bcd 100644
--- a/includes/PopupsContext.php
+++ b/includes/PopupsContext.php
@@ -44,14 +44,18 @@
const LOGGER_CHANNEL = 'popups';
/**
* User preference value for enabled Page Previews
+ * Identical to \HTMLFeatureField::OPTION_ENABLED in BetaFeatures
+ *
* @var string
*/
- const PREVIEWS_ENABLED = \HTMLFeatureField::OPTION_ENABLED;
+ const PREVIEWS_ENABLED = '1';
/**
* User preference value for disabled Page Previews
+ * Identical to \HTMLFeatureField::OPTION_DISABLED in BetaFeatures
+ *
* @var string
*/
- const PREVIEWS_DISABLED = \HTMLFeatureField::OPTION_DISABLED;
+ const PREVIEWS_DISABLED = '0';
/**
* User preference to enable/disable Page Previews
* Currently for BETA and regular opt in we use same preference name
--
To view, visit https://gerrit.wikimedia.org/r/345642
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I91fd695ab9d2e4b142c67884f5e8c83f3142d240
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Phuedx <samsm...@wikimedia.org>
Gerrit-Reviewer: Prtksxna <psax...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
