From: Rotem Liss <rotem@users.mediawiki.org>
Date: Tue, 17 Jun 2008 07:31:35 +0000 (+0000)
Subject: Sending e-mail using Special:EmailUser does reveal the e-mail address of the sender.
X-Git-Tag: 1.31.0-rc.0~46982
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=611c66cd0fc71f7ea244d0e3ca5a0b5f6b70a033;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/includes/specials/Emailuser.php b/includes/specials/Emailuser.php
index 3f55d0ebf2..bf4eea7575 100644
--- a/includes/specials/Emailuser.php
+++ b/includes/specials/Emailuser.php
@@ -149,14 +149,12 @@ class EmailUserForm {
 		$subject = $this->subject;
 
 		$prefsTitle = Title::newFromText( 'Preferences', NS_SPECIAL );
-		$emailTitle = Title::newFromText( 'Emailuser', NS_SPECIAL );
 		
 		// Add a standard footer
 		$footerArgs[0] = $wgSitename;
 		$footerArgs[1] = $from->name;
 		$footerArgs[2] = $to->name;
 		$footerArgs[3] = $prefsTitle->getFullURL();
-		$footerArgs[4] = $emailTitle->getFullURL() . '/' . urlencode( $from->name ); // Url to Special:Emailuser/Username
 		$this->text = $this->text . "\n" . wfMsg( 'emailuserfooter', $footerArgs );
 		
 		if( wfRunHooks( 'EmailUser', array( &$to, &$from, &$subject, &$this->text ) ) ) {
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index ae66253f93..3606efad03 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2017,8 +2017,7 @@ The e-mail address you entered in your user preferences will appear as the "From
 'emailuserfooter' => 'Sent automatically by $1 to $2 for $3
 Please note, $1 cannot be held responsible for the content of this email.
 The option to remove yourself from these mailings is in your preferences
-Check your preferences at $4 and uncheck "Enable e-mail from other users."
-To e-mail back without revealing your e-mail address, please use $5',
+Check your preferences at $4 and uncheck "Enable e-mail from other users."',
 
 # Watchlist
 'watchlist'            => 'My watchlist',