(bug 14558) New system message (emailuserfooter) is now added to the footer of e...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 0a9a00b..0346f82 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -156,6 +156,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 14132) Allow user to disable bot edits from being output to UDP. 
 * (bug 14328) jsMsg() within Wikibits now accepts a DOM object, not just a string  
 * (bug 2889) MediaWiki:Print.css applies to the printable version
+* (bug 14558) New system message (emailuserfooter) is now added to the footer of 
+  e-mails sent with Special:Emailuser
   
 === Bug fixes in 1.13 ===
 

diff --git a/includes/specials/Emailuser.php b/includes/specials/Emailuser.php
index c06d7a5..db82753 100644 (file)
--- a/includes/specials/Emailuser.php
+++ b/includes/specials/Emailuser.php
@@ -142,12 +142,17 @@ class EmailUserForm {
         * check the edit token and ping limiter in advance.
         */
        function doSubmit() {
-               global $wgUser, $wgUserEmailUseReplyTo;
+               global $wgUser, $wgUserEmailUseReplyTo, $wgSiteName;
 
                $to = new MailAddress( $this->target );
                $from = new MailAddress( $wgUser );
                $subject = $this->subject;
 
+               $prefsTitle = Title::newFromText( 'Preferences', NS_SPECIAL );
+               
+               // Add a standard footer
+               $this->text = $this->text . "\n" . wfMsg( 'emailuserfooter', array( $wgSitename, $prefsTitle->getFullURL() ) );
+
                if( wfRunHooks( 'EmailUser', array( &$to, &$from, &$subject, &$this->text ) ) ) {
 
                        if( $wgUserEmailUseReplyTo ) {

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 6361b3e..7092339 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2014,6 +2014,9 @@ 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' => '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 $2 and uncheck "Enable e-mail from other users."',
 
 # Watchlist
 'watchlist'            => 'My watchlist',