jenkins-bot has submitted this change and it was merged.
Change subject: Introduce config variable to control tagline
......................................................................
Introduce config variable to control tagline
This patch aims to help fix that by introducing a new variable
exclusively for tagline descriptions. A follow-on patch that renames
some variables is planned separately due to it being a breaking change.
Changes:
* New variable: MFDisplayWikibaseDescriptionsAsTaglines
Bug: T138738
Change-Id: Idb747699ebbba3e40100f697848cc10a980f1f0a
---
M README.md
M extension.json
M includes/MobileFrontend.hooks.php
M tests/browser/LocalSettings.php
4 files changed, 15 insertions(+), 6 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/README.md b/README.md
index d1910f9..5bcc297 100644
--- a/README.md
+++ b/README.md
@@ -519,14 +519,20 @@
Default: 0;
##### $wgMFUseWikibaseDescription
-If set to true, will add Wikidata description to page JS as wgMFDescription
variable
+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,
+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..692c756 100644
--- a/extension.json
+++ b/extension.json
@@ -2078,6 +2078,7 @@
"MFUploadMinEdits": 0,
"MFUseWikibaseDescription": false,
"MFDisplayWikibaseDescription": false,
+ "MFDisplayWikibaseDescriptionsAsTaglines": false,
"MFRSSFeedLink": false,
"MFSchemaMobileWebLanguageSwitcherSampleRate": {
"beta": 0,
diff --git a/includes/MobileFrontend.hooks.php
b/includes/MobileFrontend.hooks.php
index 3f44686..5e51706 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.
+ $useWikidata = $config->get( 'MFUseWikibaseDescription' );
$displayDescriptions = $config->get(
'MFDisplayWikibaseDescription' );
- $useDescriptions = $config->get( 'MFUseWikibaseDescription' );
// 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(
'MFUseWikibaseDescription' );
+ $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..ff9b49b 100644
--- a/tests/browser/LocalSettings.php
+++ b/tests/browser/LocalSettings.php
@@ -28,3 +28,4 @@
// For those who have wikibase installed.
$wgMFUseWikibaseDescription = true;
$wgMFDisplayWikibaseDescription = true;
+$wgMFDisplayWikibaseDescriptionsAsTaglines = true;
--
To view, visit https://gerrit.wikimedia.org/r/296281
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idb747699ebbba3e40100f697848cc10a980f1f0a
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jhobs <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Jhobs <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
