r100141 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r100140‎ | r100141 | r100142 >
Date:18:23, 18 October 2011
Author:preilly
Status:ok (Comments)
Tags:
Comment:
fix for bug 31329 - bad view this page on regular wikipedia link
Modified paths:
  • /trunk/extensions/MobileFrontend/MobileFrontend.php (modified) (history)

Diff [purge]

Index: trunk/extensions/MobileFrontend/MobileFrontend.php
@@ -304,12 +304,8 @@
305305 self::$disableImagesURL = $wgRequest->escapeAppendQuery( 'disableImages=1' );
306306 self::$enableImagesURL = $wgRequest->escapeAppendQuery( 'enableImages=1' );
307307 self::$disableMobileSiteURL = $wgRequest->escapeAppendQuery( 'mobileaction=disable_mobile_site' );
308 - $parsedUrl = wfParseUrl( $wgRequest->getFullRequestURL() );
309 - $parsedUrl['host'] = str_replace( $wgMobileDomain, '.', $parsedUrl['host'] );
310 - $parsedUrl['query'] = $this->removeQueryStringParameter( '?mobileaction=view_normal_site&' . $parsedUrl['query'], 'useformat' );
311 - $fragmentDelimiter = ( !empty( $parsedUrl['fragment'] ) ) ? '#' : '';
312 - self::$viewNormalSiteURL = $parsedUrl['scheme'] . '://' . $parsedUrl['host'] . $parsedUrl['path'] . $parsedUrl['query'] . $fragmentDelimiter . $parsedUrl['fragment'];
313 - self::$currentURL = $wgRequest->getFullRequestURL();
 308+ self::$viewNormalSiteURL = $wgRequest->escapeAppendQuery( 'mobileaction=view_normal_site' );
 309+ self::$currentURL = $wgRequest->getFullRequestURL();
314310 self::$leaveFeedbackURL = $wgRequest->escapeAppendQuery( 'mobileaction=leave_feedback' );
315311
316312 $skin = $wgUser->getSkin();

Follow-up revisions

RevisionCommit summaryAuthorDate
r100142mft r100141preilly18:24, 18 October 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r100136fix for bug 31329 - bad view this page on regular wikipedia linkpreilly17:56, 18 October 2011

Comments

#Comment by G.Hagedorn (talk | contribs)   10:55, 19 October 2011

applied to 1.18wmf1, please consider tagging 1.18, unless reverted in follow-up

Status & tagging log