r113971 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r113970‎ | r113971 | r113972 >
Date:23:08, 15 March 2012
Author:awjrichards
Status:ok
Tags:
Comment:
Fix for bug 35249, makes disable mobile version confirmation page properly redirect after confirmation
Modified paths:
  • /trunk/extensions/MobileFrontend/templates/DisableTemplate.php (modified) (history)

Diff [purge]

Index: trunk/extensions/MobileFrontend/templates/DisableTemplate.php
@@ -8,7 +8,9 @@
99
1010 public function getHTML() {
1111
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 );
1315 $mobileRedirectFormAction = $this->data['mobileRedirectFormAction'];
1416
1517 $disableHtml = <<<HTML
@@ -20,7 +22,7 @@
2123 </p>
2224 <div id='disableButtons'>
2325 <form action='{$mobileRedirectFormAction}' method='get'>
24 - <input name='to' type='hidden' value='{$this->data['currentURL']}' />
 26+ <input name='to' type='hidden' value='{$currentURL}' />
2527 <input name='expires_in_days' type='hidden' value='3650' />
2628 <button id='disableButton' type='submit'>{$this->data['disableButton']}</button>
2729 </form>

Follow-up revisions

RevisionCommit summaryAuthorDate
r113973MFT r113971awjrichards23:10, 15 March 2012
r114205MFT r113942, r113971, r113987, r114005, r114025, r114100awjrichards22:25, 19 March 2012

Status & tagging log