Jdlrobson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/90062


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, 6 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/62/90062/1

diff --git a/includes/MobileFrontend.hooks.php 
b/includes/MobileFrontend.hooks.php
index aa803ed..fdf567d 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -114,13 +114,16 @@
 
                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 ) ) {
+                               $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: newchange
Gerrit-Change-Id: Id1347237f70d93dbd9c9bbe376dbecd411b76d85
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to