jenkins-bot has submitted this change and it was merged.

Change subject: Have link to switch back to desktop view be protocol-relative
......................................................................


Have link to switch back to desktop view be protocol-relative

Bug: T99343
Change-Id: Ibd83ef45830067a056c360cf05ccfd22fd8101af
---
M includes/skins/SkinMinerva.php
1 file changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Alex Monk: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 48a3a43..365a9d5 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -1136,7 +1136,9 @@
                                $req->appendQueryValue( 'mobileaction', 
'toggle_view_desktop', true )
                        );
                }
-               $url = htmlspecialchars( $this->mobileContext->getDesktopUrl( 
wfExpandUrl( $url ) ) );
+               $url = htmlspecialchars(
+                       $this->mobileContext->getDesktopUrl( wfExpandUrl( $url, 
PROTO_RELATIVE ) )
+               );
 
                $desktop = wfMessage( 'mobile-frontend-view-desktop' 
)->escaped();
                $mobile = wfMessage( 'mobile-frontend-view-mobile' )->escaped();

-- 
To view, visit https://gerrit.wikimedia.org/r/213190
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibd83ef45830067a056c360cf05ccfd22fd8101af
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to