https://www.mediawiki.org/wiki/Special:Code/MediaWiki/111270
Revision: 111270
Author: wikinaut
Date: 2012-02-11 23:46:37 +0000 (Sat, 11 Feb 2012)
Log Message:
-----------
Aashish's fix for bug33997 (SpecialPasswordReset does not always has the
correct returnto= page on the login / create account portlet and returns to
SpecialPasswortReset instead to Main page )
Modified Paths:
--------------
trunk/phase3/includes/specials/SpecialUserlogin.php
Modified: trunk/phase3/includes/specials/SpecialUserlogin.php
===================================================================
--- trunk/phase3/includes/specials/SpecialUserlogin.php 2012-02-11 22:53:26 UTC
(rev 111269)
+++ trunk/phase3/includes/specials/SpecialUserlogin.php 2012-02-11 23:46:37 UTC
(rev 111270)
@@ -133,9 +133,13 @@
}
$wgAuth->setDomain( $this->mDomain );
- # When switching accounts, it sucks to get automatically logged
out
+ # 1. When switching accounts, it sucks to get automatically
logged out
+ # 2. Do not return to PasswordReset after a successful password
change
+ # but goto Wiki start page (Main_Page) instead ( bug 33997 )
$returnToTitle = Title::newFromText( $this->mReturnTo );
- if( is_object( $returnToTitle ) && $returnToTitle->isSpecial(
'Userlogout' ) ) {
+ if( is_object( $returnToTitle ) && (
+ $returnToTitle->isSpecial( 'Userlogout' )
+ || $returnToTitle->isSpecial( 'PasswordReset' ) ) ) {
$this->mReturnTo = '';
$this->mReturnToQuery = '';
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
