From 813d3ca0b5a8e1ffbd177c65d6ad2598b3a4aa71 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Tue, 17 Jun 2008 04:34:31 +0000 Subject: [PATCH] Other params that are useful to this message. Hasn't been translated yet, so no downstream effects. --- includes/specials/Emailuser.php | 10 ++++++++-- languages/messages/MessagesEn.php | 6 ++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/includes/specials/Emailuser.php b/includes/specials/Emailuser.php index db827537c8..3f55d0ebf2 100644 --- a/includes/specials/Emailuser.php +++ b/includes/specials/Emailuser.php @@ -149,10 +149,16 @@ class EmailUserForm { $subject = $this->subject; $prefsTitle = Title::newFromText( 'Preferences', NS_SPECIAL ); + $emailTitle = Title::newFromText( 'Emailuser', NS_SPECIAL ); // Add a standard footer - $this->text = $this->text . "\n" . wfMsg( 'emailuserfooter', array( $wgSitename, $prefsTitle->getFullURL() ) ); - + $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 ) ) ) { if( $wgUserEmailUseReplyTo ) { diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 7092339f4a..ae66253f93 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -2014,9 +2014,11 @@ 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. +'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 $2 and uncheck "Enable e-mail from other users."', +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', # Watchlist 'watchlist' => 'My watchlist', -- 2.20.1