From: Andrew Garrett <werdna@users.mediawiki.org>
Date: Sat, 12 Apr 2008 15:11:23 +0000 (+0000)
Subject: * Add a footer (emailuser-footer) to the bottom of messages sent with Special:EmailUser
X-Git-Tag: 1.31.0-rc.0~48415
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=bac1733d946400b5ad841a8222f9dd30aa83c233;p=lhc%2Fweb%2Fwiklou.git

* Add a footer (emailuser-footer) to the bottom of messages sent with Special:EmailUser
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 77bd5d9228..2707ea5efa 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -71,6 +71,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 ** (bug 8617) Separate main page url and name
 * Automatically add old redirects to the redirect table when needed
 * (bug 6934) Allow separated inclusions, links, redirects on whatlinkshere
+* Add a footer (emailuser-footer) to the bottom of messages sent with
+Special:EmailUser
 
 === Bug fixes in 1.13 ===
 
diff --git a/includes/SpecialEmailuser.php b/includes/SpecialEmailuser.php
index 8995eb5dc8..27ef9701d1 100644
--- a/includes/SpecialEmailuser.php
+++ b/includes/SpecialEmailuser.php
@@ -179,6 +179,8 @@ class EmailUserForm {
 				$mailFrom = $from;
 				$replyTo = null;
 			}
+			
+			$this->text .= wfMsgForContent( 'emailuser-footer' );
 
 			$mailResult = UserMailer::send( $to, $mailFrom, $subject, $this->text, $replyTo );
 
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 7f07b1ca60..14b7a71bb8 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1906,6 +1906,8 @@ 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'	  => "--
+This email was sent using the 'email user' feature of {{SITENAME}}",
 
 # Watchlist
 'watchlist'            => 'My watchlist',