Sending e-mail using Special:EmailUser does reveal the e-mail address of the sender.

[lhc/web/wiklou.git] / includes / specials / Emailuser.php

diff --git a/includes/specials/Emailuser.php b/includes/specials/Emailuser.php
index db82753..bf4eea7 100644 (file)
--- a/includes/specials/Emailuser.php
+++ b/includes/specials/Emailuser.php
@@ -151,8 +151,12 @@ class EmailUserForm {
                $prefsTitle = Title::newFromText( 'Preferences', NS_SPECIAL );
                
                // Add a standard footer
-               $this->text = $this->text . "\n" . wfMsg( 'emailuserfooter', array( $wgSitename, $prefsTitle->getFullURL() ) );
-
+               $footerArgs[0] = $wgSitename;
+               $footerArgs[1] = $from->name;
+               $footerArgs[2] = $to->name;
+               $footerArgs[3] = $prefsTitle->getFullURL();
+               $this->text = $this->text . "\n" . wfMsg( 'emailuserfooter', $footerArgs );
+               
                if( wfRunHooks( 'EmailUser', array( &$to, &$from, &$subject, &$this->text ) ) ) {
 
                        if( $wgUserEmailUseReplyTo ) {