https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114889
Revision: 114889
Author: awjrichards
Date: 2012-04-13 20:34:20 +0000 (Fri, 13 Apr 2012)
Log Message:
-----------
Picking up fix for bug 35940
Modified Paths:
--------------
branches/wmf/1.19wmf1/extensions/MobileFrontend/MobileFrontend.body.php
Modified:
branches/wmf/1.19wmf1/extensions/MobileFrontend/MobileFrontend.body.php
===================================================================
--- branches/wmf/1.19wmf1/extensions/MobileFrontend/MobileFrontend.body.php
2012-04-13 20:19:46 UTC (rev 114888)
+++ branches/wmf/1.19wmf1/extensions/MobileFrontend/MobileFrontend.body.php
2012-04-13 20:34:20 UTC (rev 114889)
@@ -1102,7 +1102,9 @@
public function getDesktopUrl( $url ) {
$parsedUrl = wfParseUrl( $url );
$this->updateDesktopUrlHost( $parsedUrl );
- return wfAssembleUrl( $parsedUrl );
+ $this->updateDesktopUrlQuery( $parsedUrl );
+ $desktopUrl = wfAssembleUrl( $parsedUrl );
+ return $desktopUrl;
}
/**
@@ -1155,6 +1157,19 @@
}
/**
+ * Update the query portion of a given URL to remove any 'useformat'
params
+ * @param $parsedUrl array
+ * Result of parseUrl() or wfParseUrl()
+ */
+ protected function updateDesktopUrlQuery( &$parsedUrl ) {
+ if ( strpos( $parsedUrl['query'], 'useformat' ) !== false ) {
+ $query = wfCgiToArray( html_entity_decode(
$parsedUrl['query'] ) );
+ unset( $query['useformat'] );
+ $parsedUrl['query'] = wfArrayToCgi( $query );
+ }
+ }
+
+ /**
* Update path of given URL to conform to mobile URL template.
*
* NB: this is not actually being used anywhere at the moment. It will
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
