* (bug 832) Return to user page after emailing a user

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2251a8c..6b4c5cc 100644 (file)
--- 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 c66389e..d711947 100644 (file)
--- 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() );
        }
 }
 ?>