| Index: trunk/phase3/includes/specials/Emailuser.php |
| — | — | @@ -149,10 +149,16 @@ |
| 150 | 150 | $subject = $this->subject; |
| 151 | 151 | |
| 152 | 152 | $prefsTitle = Title::newFromText( 'Preferences', NS_SPECIAL ); |
| | 153 | + $emailTitle = Title::newFromText( 'Emailuser', NS_SPECIAL ); |
| 153 | 154 | |
| 154 | 155 | // Add a standard footer |
| 155 | | - $this->text = $this->text . "\n" . wfMsg( 'emailuserfooter', array( $wgSitename, $prefsTitle->getFullURL() ) ); |
| 156 | | - |
| | 156 | + $footerArgs[0] = $wgSitename; |
| | 157 | + $footerArgs[1] = $from->name; |
| | 158 | + $footerArgs[2] = $to->name; |
| | 159 | + $footerArgs[3] = $prefsTitle->getFullURL(); |
| | 160 | + $footerArgs[4] = $emailTitle->getFullURL() . '/' . urlencode( $from->name ); // Url to Special:Emailuser/Username |
| | 161 | + $this->text = $this->text . "\n" . wfMsg( 'emailuserfooter', $footerArgs ); |
| | 162 | + |
| 157 | 163 | if( wfRunHooks( 'EmailUser', array( &$to, &$from, &$subject, &$this->text ) ) ) { |
| 158 | 164 | |
| 159 | 165 | if( $wgUserEmailUseReplyTo ) { |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -2014,9 +2014,11 @@ |
| 2015 | 2015 | 'emailccsubject' => 'Copy of your message to $1: $2', |
| 2016 | 2016 | 'emailsent' => 'E-mail sent', |
| 2017 | 2017 | 'emailsenttext' => 'Your e-mail message has been sent.', |
| 2018 | | -'emailuserfooter' => 'Please note, $1 cannot be held responsible for the content of this email. |
| | 2018 | +'emailuserfooter' => 'Sent automatically by $1 to $2 for $3 |
| | 2019 | +Please note, $1 cannot be held responsible for the content of this email. |
| 2019 | 2020 | The option to remove yourself from these mailings is in your preferences |
| 2020 | | -Check your preferences at $2 and uncheck "Enable e-mail from other users."', |
| | 2021 | +Check your preferences at $4 and uncheck "Enable e-mail from other users." |
| | 2022 | +To e-mail back without revealing your e-mail address, please use $5', |
| 2021 | 2023 | |
| 2022 | 2024 | # Watchlist |
| 2023 | 2025 | 'watchlist' => 'My watchlist', |