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

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 77bd5d9..2707ea5 100644 (file)
--- 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 8995eb5..27ef970 100644 (file)
--- 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 7f07b1c..14b7a71 100644 (file)
--- 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',