| Index: trunk/phase3/includes/specials/Emailuser.php |
| — | — | @@ -142,12 +142,17 @@ |
| 143 | 143 | * check the edit token and ping limiter in advance. |
| 144 | 144 | */ |
| 145 | 145 | function doSubmit() { |
| 146 | | - global $wgUser, $wgUserEmailUseReplyTo; |
| | 146 | + global $wgUser, $wgUserEmailUseReplyTo, $wgSiteName; |
| 147 | 147 | |
| 148 | 148 | $to = new MailAddress( $this->target ); |
| 149 | 149 | $from = new MailAddress( $wgUser ); |
| 150 | 150 | $subject = $this->subject; |
| 151 | 151 | |
| | 152 | + $prefsTitle = Title::newFromText( 'Preferences', NS_SPECIAL ); |
| | 153 | + |
| | 154 | + // Add a standard footer |
| | 155 | + $this->text = $this->text . "\n" . wfMsg( 'emailuserfooter', array( $wgSitename, $prefsTitle->getFullURL() ) ); |
| | 156 | + |
| 152 | 157 | if( wfRunHooks( 'EmailUser', array( &$to, &$from, &$subject, &$this->text ) ) ) { |
| 153 | 158 | |
| 154 | 159 | if( $wgUserEmailUseReplyTo ) { |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -2014,6 +2014,9 @@ |
| 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. |
| | 2019 | +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."', |
| 2018 | 2021 | |
| 2019 | 2022 | # Watchlist |
| 2020 | 2023 | 'watchlist' => 'My watchlist', |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -156,6 +156,8 @@ |
| 157 | 157 | * (bug 14132) Allow user to disable bot edits from being output to UDP. |
| 158 | 158 | * (bug 14328) jsMsg() within Wikibits now accepts a DOM object, not just a string |
| 159 | 159 | * (bug 2889) MediaWiki:Print.css applies to the printable version |
| | 160 | +* (bug 14558) New system message (emailuserfooter) is now added to the footer of |
| | 161 | + e-mails sent with Special:Emailuser |
| 160 | 162 | |
| 161 | 163 | === Bug fixes in 1.13 === |
| 162 | 164 | |