r13924 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r13923‎ | r13924 | r13925 >
Date:17:05, 29 April 2006
Author:robchurch
Status:old
Tags:
Comment:
Whoops, capitalisation matters. Capitalise all instances of mReturnTo like so, so it works, and so it's consistent.
Modified paths:
  • /trunk/phase3/includes/SpecialUserlogin.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/SpecialUserlogin.php
@@ -25,7 +25,7 @@
2626 * @subpackage SpecialPage
2727 */
2828 class LoginForm {
29 - var $mName, $mPassword, $mRetype, $mReturnto, $mCookieCheck, $mPosted;
 29+ var $mName, $mPassword, $mRetype, $mReturnTo, $mCookieCheck, $mPosted;
3030 var $mAction, $mCreateaccount, $mCreateaccountMail, $mMailmypassword;
3131 var $mLoginattempt, $mRemember, $mEmail, $mDomain;
3232
@@ -42,7 +42,7 @@
4343 $this->mPassword = $request->getText( 'wpPassword' );
4444 $this->mRetype = $request->getText( 'wpRetype' );
4545 $this->mDomain = $request->getText( 'wpDomain' );
46 - $this->mReturnto = $request->getVal( 'returnto' );
 46+ $this->mReturnTo = $request->getVal( 'returnto' );
4747 $this->mCookieCheck = $request->getVal( 'wpCookieCheck' );
4848 $this->mPosted = $request->wasPosted();
4949 $this->mCreateaccount = $request->getCheck( 'wpCreateaccount' );
@@ -71,8 +71,8 @@
7272 $wgAuth->setDomain( $this->mDomain );
7373
7474 # When switching accounts, it sucks to get automatically logged out
75 - if( $this->mReturnto == $wgLang->specialPage( 'Userlogout' ) ) {
76 - $this->mReturnto = '';
 75+ if( $this->mReturnTo == $wgLang->specialPage( 'Userlogout' ) ) {
 76+ $this->mReturnTo = '';
7777 }
7878 }
7979
@@ -421,7 +421,7 @@
422422 $wgOut->setRobotpolicy( 'noindex,nofollow' );
423423 $wgOut->setArticleRelated( false );
424424 $wgOut->addWikiText( $msg );
425 - if ( !empty( $this->mReturnto ) ) {
 425+ if ( !empty( $this->mReturnTo ) ) {
426426 $wgOut->returnToMain( $auto, $this->mReturnTo );
427427 } else {
428428 $wgOut->returnToMain( $auto );
@@ -475,8 +475,8 @@
476476 $linkmsg = 'nologin';
477477 }
478478
479 - if ( !empty( $this->mReturnto ) ) {
480 - $returnto = '&returnto=' . wfUrlencode( $this->mReturnto );
 479+ if ( !empty( $this->mReturnTo ) ) {
 480+ $returnto = '&returnto=' . wfUrlencode( $this->mReturnTo );
481481 $q .= $returnto;
482482 $linkq .= $returnto;
483483 }

Status & tagging log