| Index: branches/wmf/1.18wmf1/extensions/MobileFrontend/MobileFrontend.php |
| — | — | @@ -306,7 +306,7 @@ |
| 307 | 307 | self::$disableMobileSiteURL = $wgRequest->escapeAppendQuery( 'mobileaction=disable_mobile_site' ); |
| 308 | 308 | $parsedUrl = wfParseUrl( $wgRequest->getFullRequestURL() ); |
| 309 | 309 | $parsedUrl['host'] = str_replace( $wgMobileDomain, '.', $parsedUrl['host'] ); |
| 310 | | - $parsedUrl['query'] = $this->removeQueryStringParameter( '?' . $parsedUrl['query'], 'useformat' ); |
| | 310 | + $parsedUrl['query'] = $this->removeQueryStringParameter( '?mobileaction=view_normal_site&' . $parsedUrl['query'], 'useformat' ); |
| 311 | 311 | $fragmentDelimiter = ( !empty( $parsedUrl['fragment'] ) ) ? '#' : ''; |
| 312 | 312 | self::$viewNormalSiteURL = $parsedUrl['scheme'] . '://' . $parsedUrl['host'] . $parsedUrl['path'] . $parsedUrl['query'] . $fragmentDelimiter . $parsedUrl['fragment']; |
| 313 | 313 | self::$currentURL = $wgRequest->getFullRequestURL(); |
| — | — | @@ -546,7 +546,8 @@ |
| 547 | 547 | if ( self::$useFormat === 'mobile' || |
| 548 | 548 | self::$useFormat === 'mobile-wap' || |
| 549 | 549 | !empty( $xDevice ) ) { |
| 550 | | - if ( $action !== 'edit' ) { |
| | 550 | + if ( $action !== 'edit' && |
| | 551 | + $mobileAction !== 'view_normal_site' ) { |
| 551 | 552 | $this->getMsg(); |
| 552 | 553 | $this->disableCaching(); |
| 553 | 554 | $this->sendXDeviceVaryHeader(); |