| Index: branches/wmf/1.17wmf1/extensions/MobileFrontend/MobileFrontend.php |
| — | — | @@ -65,7 +65,7 @@ |
| 66 | 66 | ); |
| 67 | 67 | |
| 68 | 68 | class ExtMobileFrontend { |
| 69 | | - const VERSION = '0.5.45'; |
| | 69 | + const VERSION = '0.5.46'; |
| 70 | 70 | |
| 71 | 71 | /** |
| 72 | 72 | * @var DOMDocument |
| — | — | @@ -102,6 +102,7 @@ |
| 103 | 103 | public static $enableImagesURL; |
| 104 | 104 | public static $disableMobileSiteURL; |
| 105 | 105 | public static $viewNormalSiteURL; |
| | 106 | + public static $currentURL; |
| 106 | 107 | |
| 107 | 108 | public $itemsToRemove = array( |
| 108 | 109 | '#contentSub', # redirection notice |
| — | — | @@ -155,6 +156,7 @@ |
| 156 | 157 | self::$enableImagesURL = $wgRequest->escapeAppendQuery( 'enableImages=1' ); |
| 157 | 158 | self::$disableMobileSiteURL = $wgRequest->escapeAppendQuery( 'mobileaction=disable_mobile_site' ); |
| 158 | 159 | self::$viewNormalSiteURL = $wgRequest->escapeAppendQuery( 'mobileaction=view_normal_site' ); |
| | 160 | + self::$currentURL = $wgRequest->getFullRequestURL(); |
| 159 | 161 | |
| 160 | 162 | $skin = $wgUser->getSkin(); |
| 161 | 163 | $copyright = $skin->getCopyright(); |
| Index: branches/wmf/1.17wmf1/extensions/MobileFrontend/views/information/disable.html.php |
| — | — | @@ -1,6 +1,7 @@ |
| 2 | 2 | <?php |
| 3 | 3 | |
| 4 | 4 | $lang = self::$code; |
| | 5 | +$currentURL = self::$currentURL; |
| 5 | 6 | |
| 6 | 7 | $disableHtml = <<<EOT |
| 7 | 8 | <h1> |
| — | — | @@ -11,7 +12,7 @@ |
| 12 | 13 | </p> |
| 13 | 14 | <div id='disableButtons'> |
| 14 | 15 | <form action='http://{$lang}.wikipedia.org/w/mobileRedirect.php' method='get'> |
| 15 | | - <input name='to' type='hidden' value='http://{$lang}.wikipedia.org/' /> |
| | 16 | + <input name='to' type='hidden' value='{$currentURL}' /> |
| 16 | 17 | <input name='expires_in_days' type='hidden' value='3650' /> |
| 17 | 18 | <button id='disableButton' type='submit'>{$disableButton}</button> |
| 18 | 19 | </form> |