From 486dd110bfb4d8f06b2b268631d89e58a00c72b8 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Sat, 5 Jul 2008 14:43:56 +0000 Subject: [PATCH] Re-implement "Email user footer," * Now grabs message from global language instead of user's UI lang. * Added a separator between msg and footer * Shortened message * Removed a bunch of useless params from the previous incarnation of this. --- includes/specials/SpecialEmailuser.php | 3 ++- languages/messages/MessagesEn.php | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/includes/specials/SpecialEmailuser.php b/includes/specials/SpecialEmailuser.php index d6f71518ba..8fc900c05f 100644 --- a/includes/specials/SpecialEmailuser.php +++ b/includes/specials/SpecialEmailuser.php @@ -148,7 +148,8 @@ class EmailUserForm { $from = new MailAddress( $wgUser ); $subject = $this->subject; - $prefsTitle = Title::newFromText( 'Preferences', NS_SPECIAL ); + // Add a standard footer + $this->text = $this->text . "\n ---- \n" . wfMsgForContent( 'emailuserfooter', array( $from->name, $to->name ) ); if( wfRunHooks( 'EmailUser', array( &$to, &$from, &$subject, &$this->text ) ) ) { diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 02b06be246..9bef1f42a7 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -2038,6 +2038,7 @@ 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 e-mail was sent by $1 to $2 by the "Email user" function at {{SITENAME}}.', # Watchlist 'watchlist' => 'My watchlist', -- 2.20.1