http://www.mediawiki.org/wiki/Special:Code/MediaWiki/96021

Revision: 96021
Author:   preilly
Date:     2011-09-01 18:15:02 +0000 (Thu, 01 Sep 2011)
Log Message:
-----------
small fix for image enable/disable caching issue

Modified Paths:
--------------
    trunk/extensions/MobileFrontend/MobileFrontend.php

Modified: trunk/extensions/MobileFrontend/MobileFrontend.php
===================================================================
--- trunk/extensions/MobileFrontend/MobileFrontend.php  2011-09-01 18:11:06 UTC 
(rev 96020)
+++ trunk/extensions/MobileFrontend/MobileFrontend.php  2011-09-01 18:15:02 UTC 
(rev 96021)
@@ -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

Reply via email to