From: Anders Wegge Jakobsen <wegge@users.mediawiki.org>
Date: Sat, 29 Apr 2006 07:31:26 +0000 (+0000)
Subject: Use the returnto parameter on successfull login
X-Git-Tag: 1.31.0-rc.0~57340
X-Git-Url: http://git.cyclocoop.org/data/%7BGarradin/WEBSITE%7D?a=commitdiff_plain;h=b2415fc9fce78f473017cc002f1f848bdbe71bd5;p=lhc%2Fweb%2Fwiklou.git

Use the returnto parameter on successfull login
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c0cd88d2db..6497f62a66 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -137,6 +137,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 5751) Updates to Portuguese localisation files
 * (bug 5741) Introduce {{NUMBEROFUSERS}} magic word
 * (bug 93) <nowiki> tags and tildes in templates
+* The returnto parameter is now actually used by SpecialUserlogin.php
 
 == Compatibility ==
 
diff --git a/includes/SpecialUserlogin.php b/includes/SpecialUserlogin.php
index 3c98c7aa65..d6112c828c 100644
--- a/includes/SpecialUserlogin.php
+++ b/includes/SpecialUserlogin.php
@@ -421,7 +421,11 @@ class LoginForm {
 		$wgOut->setRobotpolicy( 'noindex,nofollow' );
 		$wgOut->setArticleRelated( false );
 		$wgOut->addWikiText( $msg );
-		$wgOut->returnToMain( $auto );
+		if ( !empty( $this->mReturnto ) ) {
+			$wgOut->returnToMain( $auto, $this->mReturnTo );
+		} else {
+			$wgOut->returnToMain( $auto );
+		}
 	}
 
 	/** */