* (bug 13031) Add links to usepages in e-mail form

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 6019ed2..ddf2f8f 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -59,6 +59,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   to allow functionality on not-quite-right usernames
 * (bug 12575) Prevent duplicate patrol log entries from being created
 * (bug 13174) __HIDDENCAT__ now applies only to category pages
+* (bug 13031) Add links to user pages in e-mail form
 
 
 === API changes in 1.13 ===

diff --git a/includes/SpecialEmailuser.php b/includes/SpecialEmailuser.php
index 7de89dc..e9e1144 100644 (file)
--- a/includes/SpecialEmailuser.php
+++ b/includes/SpecialEmailuser.php
@@ -92,6 +92,7 @@ class EmailUserForm {
 
        function showForm() {
                global $wgOut, $wgUser;
+               $skin = $wgUser->getSkin();
 
                $wgOut->setPagetitle( wfMsg( "emailpage" ) );
                $wgOut->addWikiMsg( "emailpagetext" );
@@ -101,9 +102,11 @@ class EmailUserForm {
                }
 
                $emf = wfMsg( "emailfrom" );
-               $sender = $wgUser->getName();
+               $senderLink = $skin->makeLinkObj(
+                       $wgUser->getUserPage(), htmlspecialchars( $wgUser->getName() ) );
                $emt = wfMsg( "emailto" );
-               $rcpt = $this->target->getName();
+               $recipientLink = $skin->makeLinkObj(
+                       $this->target->getUserPage(), htmlspecialchars( $this->target->getName() ) );
                $emr = wfMsg( "emailsubject" );
                $emm = wfMsg( "emailmessage" );
                $ems = wfMsg( "emailsend" );
@@ -119,10 +122,10 @@ class EmailUserForm {
 <form id=\"emailuser\" method=\"post\" action=\"{$action}\">
 <table border='0' id='mailheader'><tr>
 <td align='right'>{$emf}:</td>
-<td align='left'><strong>" . htmlspecialchars( $sender ) . "</strong></td>
+<td align='left'><strong>{$senderLink}</strong></td>
 </tr><tr>
 <td align='right'>{$emt}:</td>
-<td align='left'><strong>" . htmlspecialchars( $rcpt ) . "</strong></td>
+<td align='left'><strong>{$recipientLink}</strong></td>
 </tr><tr>
 <td align='right'>{$emr}:</td>
 <td align='left'>