http://www.mediawiki.org/wiki/Special:Code/MediaWiki/96022
Revision: 96022
Author: preilly
Date: 2011-09-01 18:17:18 +0000 (Thu, 01 Sep 2011)
Log Message:
-----------
mft r96021
Modified Paths:
--------------
branches/wmf/1.17wmf1/extensions/MobileFrontend/MobileFrontend.php
Modified: branches/wmf/1.17wmf1/extensions/MobileFrontend/MobileFrontend.php
===================================================================
--- branches/wmf/1.17wmf1/extensions/MobileFrontend/MobileFrontend.php
2011-09-01 18:15:02 UTC (rev 96021)
+++ branches/wmf/1.17wmf1/extensions/MobileFrontend/MobileFrontend.php
2011-09-01 18:17:18 UTC (rev 96022)
@@ -265,10 +265,10 @@
if ( self::$disableImages == 1 ) {
$wgRequest->response()->setcookie( 'disableImages', 1 );
- $location = str_replace( 'disableImages=1', '',
$wgRequest->getRequestURL() );
+ $location = str_replace('?disableImages=1', '',
str_replace( '&disableImages=1', '', $wgRequest->appendQuery('mfi=0') ) );
$wgRequest->response()->header( 'Location: ' .
$location );
}
-
+
if ( self::$disableImages == 0 ) {
$disableImages = $wgRequest->getCookie( 'disableImages'
);
if ( $disableImages ) {
@@ -280,12 +280,11 @@
$disableImages = $wgRequest->getCookie( 'disableImages'
);
if ( $disableImages ) {
$wgRequest->response()->setcookie(
'disableImages', '' );
- $location = str_replace( 'enableImages=1', '',
$wgRequest->getRequestURL() );
- $wgRequest->response()->header( 'Location: ' .
$location );
}
+ $location = str_replace( '?enableImages=1', '',
str_replace( '&enableImages=1', '', $wgRequest->appendQuery('mfi=1') ) );
+ $wgRequest->response()->header( 'Location: ' .
$location );
}
-
self::$useFormat = $wgRequest->getText( 'useformat' );
self::$format = $wgRequest->getText( 'format' );
self::$requestedSegment = $wgRequest->getText( 'seg', 0 );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
