| Index: trunk/phase3/includes/specials/SpecialUserlogin.php |
| — | — | @@ -133,9 +133,13 @@ |
| 134 | 134 | } |
| 135 | 135 | $wgAuth->setDomain( $this->mDomain ); |
| 136 | 136 | |
| 137 | | - # When switching accounts, it sucks to get automatically logged out |
| | 137 | + # 1. When switching accounts, it sucks to get automatically logged out |
| | 138 | + # 2. Do not return to PasswordReset after a successful password change |
| | 139 | + # but goto Wiki start page (Main_Page) instead ( bug 33997 ) |
| 138 | 140 | $returnToTitle = Title::newFromText( $this->mReturnTo ); |
| 139 | | - if( is_object( $returnToTitle ) && $returnToTitle->isSpecial( 'Userlogout' ) ) { |
| | 141 | + if( is_object( $returnToTitle ) && ( |
| | 142 | + $returnToTitle->isSpecial( 'Userlogout' ) |
| | 143 | + || $returnToTitle->isSpecial( 'PasswordReset' ) ) ) { |
| 140 | 144 | $this->mReturnTo = ''; |
| 141 | 145 | $this->mReturnToQuery = ''; |
| 142 | 146 | } |