| Index: trunk/phase3/includes/SpecialUserlogin.php |
| — | — | @@ -36,7 +36,7 @@ |
| 37 | 37 | |
| 38 | 38 | var $mName, $mPassword, $mRetype, $mReturnTo, $mCookieCheck, $mPosted; |
| 39 | 39 | var $mAction, $mCreateaccount, $mCreateaccountMail, $mMailmypassword; |
| 40 | | - var $mLoginattempt, $mRemember, $mEmail, $mDomain, $mLanguage; |
| | 40 | + var $mLoginattempt, $mRemember, $mEmail, $mDomain, $mLanguage, $mSkipCookieCheck; |
| 41 | 41 | |
| 42 | 42 | /** |
| 43 | 43 | * Constructor |
| — | — | @@ -63,6 +63,7 @@ |
| 64 | 64 | $this->mAction = $request->getVal( 'action' ); |
| 65 | 65 | $this->mRemember = $request->getCheck( 'wpRemember' ); |
| 66 | 66 | $this->mLanguage = $request->getText( 'uselang' ); |
| | 67 | + $this->mSkipCookieCheck = $request->getCheck( 'wpSkipCookieCheck' ); |
| 67 | 68 | |
| 68 | 69 | if( $wgEnableEmail ) { |
| 69 | 70 | $this->mEmail = $request->getText( 'wpEmail' ); |
| — | — | @@ -501,7 +502,7 @@ |
| 502 | 503 | } |
| 503 | 504 | $wgUser->setCookies(); |
| 504 | 505 | |
| 505 | | - if( $this->hasSessionCookie() ) { |
| | 506 | + if( $this->hasSessionCookie() || $this->mSkipCookieCheck ) { |
| 506 | 507 | /* Replace the language object to provide user interface in correct |
| 507 | 508 | * language immediately on this first page load. |
| 508 | 509 | */ |