From 1f712cebcd430e669b33e415132463d3265f7ff6 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 30 Apr 2004 06:40:25 +0000
Subject: [PATCH] Fix the return-to-last-page on login/logout in MonoBook skin.

---
 includes/SkinPHPTal.php       | 6 +++---
 includes/SpecialUserlogin.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/includes/SkinPHPTal.php b/includes/SkinPHPTal.php
index 6de4a212be..8c8857aef0 100644
--- a/includes/SkinPHPTal.php
+++ b/includes/SkinPHPTal.php
@@ -253,7 +253,7 @@
 				);
 				$personal_urls['logout'] = array(
 					'text' => wfMsg('userlogout'),
-					'href' => $this->makeSpecialUrl('Userlogout','returnpage=' . $this->thisurle),
+					'href' => $this->makeSpecialUrl('Userlogout','returnto=' . $this->thisurle),
 					'ttip' => wfMsg('tooltip-logout'),
 					'akey' => wfMsg('accesskey-logout')
 				);
@@ -273,7 +273,7 @@
 					);
 					$personal_urls['anonlogin'] = array(
 						'text' => wfMsg('userlogin'),
-						'href' => $this->makeSpecialUrl('Userlogin', 'return='.$this->thisurle),
+						'href' => $this->makeSpecialUrl('Userlogin', 'returnto='.$this->thisurle),
 						'ttip' => wfMsg('tooltip-login'),
 						'akey' => wfMsg('accesskey-login')
 					);
@@ -281,7 +281,7 @@
 
 					$personal_urls['login'] = array(
 						'text' => wfMsg('userlogin'),
-						'href' => $this->makeSpecialUrl('Userlogin', 'return='.$this->thisurle),
+						'href' => $this->makeSpecialUrl('Userlogin', 'returnto='.$this->thisurle),
 						'ttip' => wfMsg('tooltip-login'),
 						'akey' => wfMsg('accesskey-login')
 					);
diff --git a/includes/SpecialUserlogin.php b/includes/SpecialUserlogin.php
index 793224e416..c950ed5f15 100644
--- a/includes/SpecialUserlogin.php
+++ b/includes/SpecialUserlogin.php
@@ -25,7 +25,7 @@ class LoginForm {
 		$this->mName = $request->getText( 'wpName' );
 		$this->mPassword = $request->getText( 'wpPassword' );
 		$this->mRetype = $request->getText( 'wpRetype' );
-		$this->mReturnto = $request->getText( 'returnto' );
+		$this->mReturnto = $request->getVal( 'returnto' );
 		$this->mCookieCheck = $request->getVal( "wpCookieCheck" );
 		$this->mPosted = $request->wasPosted();
 		$this->mCreateaccount = $request->getCheck( 'wpCreateaccount' );
-- 
2.20.1