http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100142
Revision: 100142
Author: preilly
Date: 2011-10-18 18:24:07 +0000 (Tue, 18 Oct 2011)
Log Message:
-----------
mft r100141
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 18:23:07 UTC (rev 100141)
+++ branches/wmf/1.18wmf1/extensions/MobileFrontend/MobileFrontend.php
2011-10-18 18:24:07 UTC (rev 100142)
@@ -304,12 +304,8 @@
self::$disableImagesURL = $wgRequest->escapeAppendQuery(
'disableImages=1' );
self::$enableImagesURL = $wgRequest->escapeAppendQuery(
'enableImages=1' );
self::$disableMobileSiteURL = $wgRequest->escapeAppendQuery(
'mobileaction=disable_mobile_site' );
- $parsedUrl = wfParseUrl( $wgRequest->getFullRequestURL() );
- $parsedUrl['host'] = str_replace( $wgMobileDomain, '.',
$parsedUrl['host'] );
- $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();
+ self::$viewNormalSiteURL = $wgRequest->escapeAppendQuery(
'mobileaction=view_normal_site' );
+ self::$currentURL = $wgRequest->getFullRequestURL();
self::$leaveFeedbackURL = $wgRequest->escapeAppendQuery(
'mobileaction=leave_feedback' );
$skin = $wgUser->getSkin();
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
