Index: trunk/extensions/MobileFrontend/templates/DisableTemplate.php |
— | — | @@ -8,7 +8,9 @@ |
9 | 9 | |
10 | 10 | public function getHTML() { |
11 | 11 | |
12 | | - $currentURL = str_replace( '&mobileaction=disable_mobile_site', '', $this->data['currentURL'] ); // TODO: $currentURl is unused |
| 12 | + |
| 13 | + $currentURL = str_replace( '&mobileaction=disable_mobile_site', '', $this->data['currentURL'] ); |
| 14 | + $currentURL = str_replace( '&useformat=mobile', '', $currentURL ); |
13 | 15 | $mobileRedirectFormAction = $this->data['mobileRedirectFormAction']; |
14 | 16 | |
15 | 17 | $disableHtml = <<<HTML |
— | — | @@ -20,7 +22,7 @@ |
21 | 23 | </p> |
22 | 24 | <div id='disableButtons'> |
23 | 25 | <form action='{$mobileRedirectFormAction}' method='get'> |
24 | | - <input name='to' type='hidden' value='{$this->data['currentURL']}' /> |
| 26 | + <input name='to' type='hidden' value='{$currentURL}' /> |
25 | 27 | <input name='expires_in_days' type='hidden' value='3650' /> |
26 | 28 | <button id='disableButton' type='submit'>{$this->data['disableButton']}</button> |
27 | 29 | </form> |