jenkins-bot has submitted this change and it was merged.
Change subject: Don't call isBetaGroupMember in ResourceLoaderGetConfigVars hook
......................................................................
Don't call isBetaGroupMember in ResourceLoaderGetConfigVars hook
Remove code relating to beta, given that the default behaviour is to
enable this now. This should have been cleaned up when pushing to stable
Add a note that isBetaGroupMember should not be called in this function
given its result needs the User object to work.
This aside MobileContext is perfectly safe in this environment
Bug: T127860
Change-Id: I022d41a6fbf2ee2da32939656a77e85ce26e063b
---
M includes/MobileFrontend.hooks.php
1 file changed, 1 insertion(+), 3 deletions(-)
Approvals:
Florianschmidtwelzow: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/MobileFrontend.hooks.php
b/includes/MobileFrontend.hooks.php
index 32c8725..5240b33 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -380,6 +380,7 @@
* ResourceLoaderGetConfigVars hook handler
* This should be used for variables which vary with the html
* and for variables that should work cross skin including anonymous
users
+ * this includes use of MobileContext::isBetaGroupMember in this
function
* @see
https://www.mediawiki.org/wiki/Manual:Hooks/ResourceLoaderGetConfigVars
*
* @param array $vars
@@ -409,9 +410,6 @@
$displayDescriptions = $config->get(
'MFDisplayWikibaseDescription' );
$useDescriptions = $config->get( 'MFUseWikibaseDescription' );
- if ( $context->isBetaGroupMember() ) {
- $displayDescriptions = true;
- }
// When set turn on Wikidata descriptions
// https://phabricator.wikimedia.org/T101719
if ( $useDescriptions && $displayDescriptions ) {
--
To view, visit https://gerrit.wikimedia.org/r/272810
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I022d41a6fbf2ee2da32939656a77e85ce26e063b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
