r101659 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r101658‎ | r101659 | r101660 >
Date:18:53, 2 November 2011
Author:preilly
Status:deferred
Tags:
Comment:
1.18wmf1: MFT r101658
Modified paths:
  • /branches/wmf/1.18wmf1/extensions/MobileFrontend/MobileFrontend.php (modified) (history)
  • /branches/wmf/1.18wmf1/extensions/MobileFrontend/views/information/optin.html.php (modified) (history)
  • /branches/wmf/1.18wmf1/extensions/MobileFrontend/views/information/optout.html.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.18wmf1/extensions/MobileFrontend/MobileFrontend.php
@@ -754,6 +754,7 @@
755755 $htmlTitle = self::$messages['mobile-frontend-opt-in-title'];
756756 $explainOptIn = self::$messages['mobile-frontend-opt-in-explain'];
757757 $optInMessage = self::$messages['mobile-frontend-opt-in-message'];
 758+ $formAction = wfExpandUrl( Title::newMainPage()->getFullURL(), PROTO_CURRENT );
758759 require( 'views/layout/_search_webkit.html.php' );
759760 require( 'views/layout/_footmenu_default.html.php' );
760761 require( 'views/information/optin.html.php' );
@@ -778,6 +779,7 @@
779780 $htmlTitle = self::$messages['mobile-frontend-opt-out-title'];
780781 $explainOptOut = self::$messages['mobile-frontend-opt-out-explain'];
781782 $optOutMessage = self::$messages['mobile-frontend-opt-out-message'];
 783+ $formAction = wfExpandUrl( Title::newMainPage()->getFullURL(), PROTO_CURRENT );
782784 require( 'views/layout/_search_webkit.html.php' );
783785 require( 'views/layout/_footmenu_default.html.php' );
784786 require( 'views/information/optout.html.php' );
Index: branches/wmf/1.18wmf1/extensions/MobileFrontend/views/information/optin.html.php
@@ -1,18 +1,18 @@
22 <?php
33 $optInHtml = <<<EOT
4 - <h1>
5 - {$optInMessage}
6 - </h1>
7 - <p>
8 - {$explainOptIn}
9 - </p>
10 - <div id='disableButtons'>
11 - <form action='/' method='get'>
12 - <input name='mobileaction' type='hidden' value='opt_in_cookie' />
13 - <button id='disableButton' type='submit'>{$yesButton}</button>
14 - </form>
15 - <form action='/' method='get'>
16 - <button id='backButton' type='submit'>{$noButton}</button>
17 - </form>
18 - </div>
 4+ <h1>
 5+ {$optInMessage}
 6+ </h1>
 7+ <p>
 8+ {$explainOptIn}
 9+ </p>
 10+ <div id='disableButtons'>
 11+ <form action='{$formAction}' method='get'>
 12+ <input name='mobileaction' type='hidden' value='opt_in_cookie' />
 13+ <button id='disableButton' type='submit'>{$yesButton}</button>
 14+ </form>
 15+ <form action='/' method='get'>
 16+ <button id='backButton' type='submit'>{$noButton}</button>
 17+ </form>
 18+ </div>
1919 EOT;
Index: branches/wmf/1.18wmf1/extensions/MobileFrontend/views/information/optout.html.php
@@ -1,18 +1,18 @@
22 <?php
33 $optOutHtml = <<<EOT
4 - <h1>
5 - {$optOutMessage}
6 - </h1>
7 - <p>
8 - {$explainOptOut}
9 - </p>
10 - <div id='disableButtons'>
11 - <form action='/' method='get'>
12 - <input name='mobileaction' type='hidden' value='opt_out_cookie' />
13 - <button id='disableButton' type='submit'>{$yesButton}</button>
14 - </form>
15 - <form action='/' method='get'>
16 - <button id='backButton' type='submit'>{$noButton}</button>
17 - </form>
18 - </div>
 4+ <h1>
 5+ {$optOutMessage}
 6+ </h1>
 7+ <p>
 8+ {$explainOptOut}
 9+ </p>
 10+ <div id='disableButtons'>
 11+ <form action='{$formAction}' method='get'>
 12+ <input name='mobileaction' type='hidden' value='opt_out_cookie' />
 13+ <button id='disableButton' type='submit'>{$yesButton}</button>
 14+ </form>
 15+ <form action='/' method='get'>
 16+ <button id='backButton' type='submit'>{$noButton}</button>
 17+ </form>
 18+ </div>
1919 EOT;

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r101658fix for bug 32149 mobilefrontend beta opt-in form redirects to / instead of t...preilly18:52, 2 November 2011

Status & tagging log