Partial revert of r32982; old Title method is fine here

[lhc/web/wiklou.git] / includes / SpecialEmailuser.php

diff --git a/includes/SpecialEmailuser.php b/includes/SpecialEmailuser.php
index 76add30..8995eb5 100644 (file)
--- a/includes/SpecialEmailuser.php
+++ b/includes/SpecialEmailuser.php
@@ -92,18 +92,21 @@ class EmailUserForm {
 
        function showForm() {
                global $wgOut, $wgUser;
+               $skin = $wgUser->getSkin();
 
                $wgOut->setPagetitle( wfMsg( "emailpage" ) );
-               $wgOut->addWikiText( wfMsg( "emailpagetext" ) );
+               $wgOut->addWikiMsg( "emailpagetext" );
 
                if ( $this->subject === "" ) {
-                       $this->subject = wfMsg( "defemailsubject" );
+                       $this->subject = wfMsgForContent( "defemailsubject" );
                }
 
                $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'>