http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100137
Revision: 100137 Author: preilly Date: 2011-10-18 17:56:50 +0000 (Tue, 18 Oct 2011) Log Message: ----------- mft r100136 Modified Paths: -------------- branches/wmf/1.18wmf1/extensions/MobileFrontend/MobileFrontend.php Modified: branches/wmf/1.18wmf1/extensions/MobileFrontend/MobileFrontend.php =================================================================== --- branches/wmf/1.18wmf1/extensions/MobileFrontend/MobileFrontend.php 2011-10-18 17:56:03 UTC (rev 100136) +++ branches/wmf/1.18wmf1/extensions/MobileFrontend/MobileFrontend.php 2011-10-18 17:56:50 UTC (rev 100137) @@ -306,7 +306,7 @@ self::$disableMobileSiteURL = $wgRequest->escapeAppendQuery( 'mobileaction=disable_mobile_site' ); $parsedUrl = wfParseUrl( $wgRequest->getFullRequestURL() ); $parsedUrl['host'] = str_replace( $wgMobileDomain, '.', $parsedUrl['host'] ); - $parsedUrl['query'] = $this->removeQueryStringParameter( '?' . $parsedUrl['query'], 'useformat' ); + $parsedUrl['query'] = $this->removeQueryStringParameter( '?mobileaction=view_normal_site&' . $parsedUrl['query'], 'useformat' ); $fragmentDelimiter = ( !empty( $parsedUrl['fragment'] ) ) ? '#' : ''; self::$viewNormalSiteURL = $parsedUrl['scheme'] . '://' . $parsedUrl['host'] . $parsedUrl['path'] . $parsedUrl['query'] . $fragmentDelimiter . $parsedUrl['fragment']; self::$currentURL = $wgRequest->getFullRequestURL(); @@ -546,7 +546,8 @@ if ( self::$useFormat === 'mobile' || self::$useFormat === 'mobile-wap' || !empty( $xDevice ) ) { - if ( $action !== 'edit' ) { + if ( $action !== 'edit' && + $mobileAction !== 'view_normal_site' ) { $this->getMsg(); $this->disableCaching(); $this->sendXDeviceVaryHeader(); _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs