Jhobs has uploaded a new change for review.
https://gerrit.wikimedia.org/r/296281
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 introducing a new
variable exclusively for tagline descriptions and 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
* New variable: MFDisplayWikibaseDescriptionsAsTaglines
* Explicit variable for taglines
Bug: T138738
Change-Id: Idb747699ebbba3e40100f697848cc10a980f1f0a
---
M README.md
M extension.json
M includes/MobileFrontend.hooks.php
M tests/browser/LocalSettings.php
4 files changed, 22 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/81/296281/1
diff --git a/README.md b/README.md
index d1910f9..e7993e0 100644
--- a/README.md
+++ b/README.md
@@ -518,15 +518,21 @@
Type: Integer
Default: 0;
-##### $wgMFUseWikibaseDescription
-If set to true, will add Wikidata description to page JS as wgMFDescription
variable
+##### $wgMFUseWikibase
+If set to true, Wikibase is enabled and associated features can be used
Type: Boolean
Default: false;
-##### $wgMFDisplayWikibaseDescription
-If set to true wikidata descriptions will be displayed in UI elements such as
search,
+##### $wgMFDisplayWikibaseDescriptionsInUI
+If set to true, Wikibase descriptions will be displayed in UI elements such as
search,
nearby and watchlist.
Type: Boolean
Default: false;
+
+##### $wgMFDisplayWikibaseDescriptionsAsTaglines
+If set to true, Wikibase descriptions will be displayed under page titles
+
+Type: Boolean
+Default: false;
diff --git a/extension.json b/extension.json
index 8ae0a38..71568dd 100644
--- a/extension.json
+++ b/extension.json
@@ -2076,8 +2076,9 @@
"MFPhotoUploadWiki": null,
"MFPhotoUploadEndpoint": "",
"MFUploadMinEdits": 0,
- "MFUseWikibaseDescription": false,
- "MFDisplayWikibaseDescription": false,
+ "MFUseWikibase": false,
+ "MFDisplayWikibaseDescriptionsInUI": false,
+ "MFDisplayWikibaseDescriptionsAsTaglines": false,
"MFRSSFeedLink": false,
"MFSchemaMobileWebLanguageSwitcherSampleRate": {
"beta": 0,
diff --git a/includes/MobileFrontend.hooks.php
b/includes/MobileFrontend.hooks.php
index 3f44686..c793398 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -448,12 +448,12 @@
// 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.
- $displayDescriptions = $config->get(
'MFDisplayWikibaseDescription' );
- $useDescriptions = $config->get( 'MFUseWikibaseDescription' );
+ $useWikidata = $config->get( 'MFUseWikibase' );
+ $displayDescriptions = $config->get(
'MFDisplayWikibaseDescriptionsInUI' );
// When set turn on Wikidata descriptions
// https://phabricator.wikimedia.org/T101719
- if ( $useDescriptions && $displayDescriptions ) {
+ if ( $useWikidata && $displayDescriptions ) {
if ( !in_array( 'pageterms', $pageProps ) ) {
$pageProps[] = 'pageterms';
}
@@ -1266,14 +1266,15 @@
*/
public static function onOutputPageParserOutput( $outputPage,
ParserOutput $po ) {
$context = MobileContext::singleton();
- $mfUseWikibaseDescription = $context->getMFConfig()->get(
'MFUseWikibaseDescription' );
+ $useWikibase = $context->getMFConfig()->get( 'MFUseWikibase' );
+ $displayTaglines = $context->getMFConfig()->get(
'MFDisplayWikibaseDescriptionsAsTaglines' );
if ( $context->shouldDisplayMobileView() ) {
$outputPage->enableTOC( false );
$outputPage->setProperty( 'MFTOC', $po->getTOCHTML()
!== '' );
// FIXME: Remove beta check once enabled in production
- if ( $mfUseWikibaseDescription ||
$context->isBetaGroupMember() ) {
+ if ( $useWikibase && ( $displayTaglines ||
$context->isBetaGroupMember() ) ) {
$item = $po->getProperty( 'wikibase_item' );
if ( $item ) {
$desc =
ExtMobileFrontend::getWikibaseDescription( $item );
diff --git a/tests/browser/LocalSettings.php b/tests/browser/LocalSettings.php
index 3d7f691..6e28348 100644
--- a/tests/browser/LocalSettings.php
+++ b/tests/browser/LocalSettings.php
@@ -26,5 +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/296281
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb747699ebbba3e40100f697848cc10a980f1f0a
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
