Jhobs has uploaded a new change for review.
https://gerrit.wikimedia.org/r/296342
Change subject: Refactor wikibase config variables to be less confusing
......................................................................
Refactor wikibase config variables to be less confusing
The meanings of our wikibase variables were unclear and led to confusion
and regressions. This patch aims to fix that by renaming the two
existing variables to be more in line with their original intentions.
Changes:
* MFUseWikibaseDescription -> MFUseWikibase - Now more accurately describes
its original intention, informing if wikibase is enabled
* MFDisplayWikibaseDescription -> MFDisplayWikibaseDescriptionsInUI - Used
for features such as search, nearby, and watchlist
Bug: T138788
Change-Id: Id8cdb0737c0dc1c658a6650d9805700281834f8a
---
M README.md
M extension.json
M includes/MobileFrontend.hooks.php
M tests/browser/LocalSettings.php
4 files changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/42/296342/1
diff --git a/README.md b/README.md
index 5bcc297..e7993e0 100644
--- a/README.md
+++ b/README.md
@@ -518,13 +518,13 @@
Type: Integer
Default: 0;
-##### $wgMFUseWikibaseDescription
+##### $wgMFUseWikibase
If set to true, Wikibase is enabled and associated features can be used
Type: Boolean
Default: false;
-##### $wgMFDisplayWikibaseDescription
+##### $wgMFDisplayWikibaseDescriptionsInUI
If set to true, Wikibase descriptions will be displayed in UI elements such as
search,
nearby and watchlist.
diff --git a/extension.json b/extension.json
index 692c756..71568dd 100644
--- a/extension.json
+++ b/extension.json
@@ -2076,8 +2076,8 @@
"MFPhotoUploadWiki": null,
"MFPhotoUploadEndpoint": "",
"MFUploadMinEdits": 0,
- "MFUseWikibaseDescription": false,
- "MFDisplayWikibaseDescription": false,
+ "MFUseWikibase": false,
+ "MFDisplayWikibaseDescriptionsInUI": false,
"MFDisplayWikibaseDescriptionsAsTaglines": false,
"MFRSSFeedLink": false,
"MFSchemaMobileWebLanguageSwitcherSampleRate": {
diff --git a/includes/MobileFrontend.hooks.php
b/includes/MobileFrontend.hooks.php
index 5e51706..c793398 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -448,8 +448,8 @@
// Wikidata) and then secondly that it is okay to display them
prominently in the UI
// For instance a server admin may want to make them available
in the page via JS for gadgets
// but not build them into their experience.
- $useWikidata = $config->get( 'MFUseWikibaseDescription' );
- $displayDescriptions = $config->get(
'MFDisplayWikibaseDescription' );
+ $useWikidata = $config->get( 'MFUseWikibase' );
+ $displayDescriptions = $config->get(
'MFDisplayWikibaseDescriptionsInUI' );
// When set turn on Wikidata descriptions
// https://phabricator.wikimedia.org/T101719
@@ -1266,7 +1266,7 @@
*/
public static function onOutputPageParserOutput( $outputPage,
ParserOutput $po ) {
$context = MobileContext::singleton();
- $useWikibase = $context->getMFConfig()->get(
'MFUseWikibaseDescription' );
+ $useWikibase = $context->getMFConfig()->get( 'MFUseWikibase' );
$displayTaglines = $context->getMFConfig()->get(
'MFDisplayWikibaseDescriptionsAsTaglines' );
if ( $context->shouldDisplayMobileView() ) {
diff --git a/tests/browser/LocalSettings.php b/tests/browser/LocalSettings.php
index ff9b49b..6e28348 100644
--- a/tests/browser/LocalSettings.php
+++ b/tests/browser/LocalSettings.php
@@ -26,6 +26,6 @@
$wgMinervaAlwaysShowLanguageButton = true;
// For those who have wikibase installed.
-$wgMFUseWikibaseDescription = true;
-$wgMFDisplayWikibaseDescription = true;
+$wgMFUseWikibase = true;
+$wgMFDisplayWikibaseDescriptionsInUI = true;
$wgMFDisplayWikibaseDescriptionsAsTaglines = true;
--
To view, visit https://gerrit.wikimedia.org/r/296342
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id8cdb0737c0dc1c658a6650d9805700281834f8a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jhobs <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
