From cd715f1f6eaab91d01b610ba43ad6daf1941f1e9 Mon Sep 17 00:00:00 2001
From: Rob Church <robchurch@users.mediawiki.org>
Date: Sun, 27 Aug 2006 02:35:28 +0000
Subject: [PATCH] * (bug 832) Return to user page after emailing a user

---
 RELEASE-NOTES                 | 1 +
 includes/SpecialEmailuser.php | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2251a8c49a..6b4c5cc254 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -153,6 +153,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   default message text
 * Allows to upload from publicy accessible URL. Set $wgAllowCopyUploads = true ; in LocalSettings.php
   Limited to $wgMaxUploadSize (default:100MB); URL upload is limited to sysops by default
+* (bug 832) Return to user page after emailing a user
 
 == Languages updated ==
 
diff --git a/includes/SpecialEmailuser.php b/includes/SpecialEmailuser.php
index c66389e103..d711947fbe 100644
--- a/includes/SpecialEmailuser.php
+++ b/includes/SpecialEmailuser.php
@@ -49,7 +49,7 @@ function wfSpecialEmailuser( $par ) {
 	$f = new EmailUserForm( $nu );
 
 	if ( "success" == $action ) {
-		$f->showSuccess();
+		$f->showSuccess( $nu );
 	} else if ( "submit" == $action && $wgRequest->wasPosted() &&
 		$wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) ) ) {
 		$f->doSubmit();
@@ -148,13 +148,13 @@ class EmailUserForm {
 		}
 	}
 
-	function showSuccess() {
+	function showSuccess( &$user ) {
 		global $wgOut;
 
 		$wgOut->setPagetitle( wfMsg( "emailsent" ) );
 		$wgOut->addHTML( wfMsg( "emailsenttext" ) );
 
-		$wgOut->returnToMain( false );
+		$wgOut->returnToMain( false, $user->getUserPage() );
 	}
 }
 ?>
-- 
2.20.1