From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 19 Jun 2008 21:28:21 +0000 (+0000)
Subject: Revert the email footer for the moment. A few comments:
X-Git-Tag: 1.31.0-rc.0~46934
X-Git-Url: http://git.cyclocoop.org//%27http:/jquery.khurshid.com/ifixpng.php/%27?a=commitdiff_plain;h=f4df827f308aa09dcbb36f7c1b8d126e7e013e65;p=lhc%2Fweb%2Fwiklou.git

Revert the email footer for the moment. A few comments:
* It's using the *sending* user's UI language for the footer, which is not ideal.
* There's no clean separation between body text and footer; the text will run together unappetizingly.
* The default message is really long
* "Sent automatically" implies that it's something like a "this page changed, and the computer is notifying you", but this is an explicit user-to-user messaging action, not automatic at all.
* It's trying to take the 'allowemail' toggle string, which may contain arbitrary HTML, and pop it into a plaintext email. This can cause very ugly output if formatting or character entities are being used in the message string.
---

diff --git a/includes/specials/SpecialEmailuser.php b/includes/specials/SpecialEmailuser.php
index 596f16bab6..d6f71518ba 100644
--- a/includes/specials/SpecialEmailuser.php
+++ b/includes/specials/SpecialEmailuser.php
@@ -150,13 +150,6 @@ class EmailUserForm {
 
 		$prefsTitle = Title::newFromText( 'Preferences', NS_SPECIAL );
 		
-		// Add a standard footer
-		$footerArgs[0] = $from->name;
-		$footerArgs[1] = $to->name;
-		$footerArgs[2] = $prefsTitle->getFullURL();
-		$footerArgs[3] = wfMsg ('allowemail');
-		$this->text = $this->text . "\n" . wfMsgExt( 'emailuserfooter', 'parsemag', $footerArgs );
-		
 		if( wfRunHooks( 'EmailUser', array( &$to, &$from, &$subject, &$this->text ) ) ) {
 
 			if( $wgUserEmailUseReplyTo ) {
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 23bb65dfcf..9bcc004926 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2014,10 +2014,6 @@ The e-mail address you entered in your user preferences will appear as the "From
 'emailccsubject'  => 'Copy of your message to $1: $2',
 'emailsent'       => 'E-mail sent',
 'emailsenttext'   => 'Your e-mail message has been sent.',
-'emailuserfooter' => 'Sent automatically by {{SITENAME}} to $1 for $2.
-Please note, {{SITENAME}} 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 $3 and uncheck "$4".',
 
 # Watchlist
 'watchlist'            => 'My watchlist',