jenkins-bot has submitted this change and it was merged.
Change subject: Pass query string parameters to mobile view url
......................................................................
Pass query string parameters to mobile view url
Bug: 53297
Change-Id: Id1347237f70d93dbd9c9bbe376dbecd411b76d85
---
M includes/MobileFrontend.hooks.php
1 file changed, 8 insertions(+), 3 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/MobileFrontend.hooks.php
b/includes/MobileFrontend.hooks.php
index aa803ed..27a1e7a 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -114,13 +114,18 @@
if ( ! $isSpecial ) {
$footerlinks = $tpl->data['footerlinks'];
+ $args = $tpl->getSkin()->getRequest()->getValues();
/**
* Adds query string to force mobile view if we're not
using $wgMobileUrlTemplate
* This is to preserve pretty/canonical links for a
happy cache where possible (eg WMF cluster)
*/
- $queryString = strlen( $wgMobileUrlTemplate ) ? '' :
'mobileaction=toggle_view_mobile';
- $mobileViewUrl = $title->getFullURL( $queryString );
- $mobileViewUrl =
MobileContext::singleton()->getMobileUrl( $mobileViewUrl );
+ if ( !strlen( $wgMobileUrlTemplate ) ) {
+ // avoid title being set twice
+ unset( $args['title'] );
+ $args['mobileaction'] = 'toggle_view_mobile';
+ }
+ $mobileViewUrl = $title->getFullURL( $args );
+ $mobileViewUrl =
MobileContext::singleton()->getMobileUrl( $mobileViewUrl, $args );
$link = Html::element( 'a',
array( 'href' => $mobileViewUrl, 'class' =>
'noprint stopMobileRedirectToggle' ),
--
To view, visit https://gerrit.wikimedia.org/r/90062
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id1347237f70d93dbd9c9bbe376dbecd411b76d85
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: Awjrichards <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
