jenkins-bot has submitted this change and it was merged.
Change subject: Avoid unstubbing $wgUser in ResourceLoaderGetConfigVars hook
......................................................................
Avoid unstubbing $wgUser in ResourceLoaderGetConfigVars hook
WikimediaMessagesHooks::onMobileLicenseLink() is called during a handler
for the ResourceLoaderGetConfigVars hook. Handlers for that hook should
not vary their output based on request state, so use the content
language explicitly instead of allowing the user's preferred UI
language to cause variance.
Bug: T127866
Change-Id: I3d03cd1d51ada3d78b63d892587eb28034f4eb89
(cherry picked from commit f070b2c0001b80b996223427d3d9d6ab314b3342)
---
M WikimediaMessages.hooks.php
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/WikimediaMessages.hooks.php b/WikimediaMessages.hooks.php
index a27784d..f8e2432 100644
--- a/WikimediaMessages.hooks.php
+++ b/WikimediaMessages.hooks.php
@@ -134,7 +134,9 @@
} elseif( strpos( $wgRightsUrl,
'creativecommons.org/licenses/by-sa/3.0' ) !== false ) {
// We only display the dual licensing stack in the
editor and talk interfaces
if ( $context === 'editor' || $context === 'talk' ) {
- $link = wfMessage(
'wikimedia-mobile-license-links' )->plain();
+ $link = wfMessage(
'wikimedia-mobile-license-links' )
+ ->inContentLanguage()
+ ->plain();
}
}
--
To view, visit https://gerrit.wikimedia.org/r/272832
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3d03cd1d51ada3d78b63d892587eb28034f4eb89
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMessages
Gerrit-Branch: wmf/1.27.0-wmf.14
Gerrit-Owner: Gergő Tisza <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
