Index: trunk/phase3/includes/specials/Emailuser.php |
— | — | @@ -149,14 +149,12 @@ |
150 | 150 | $subject = $this->subject; |
151 | 151 | |
152 | 152 | $prefsTitle = Title::newFromText( 'Preferences', NS_SPECIAL ); |
153 | | - $emailTitle = Title::newFromText( 'Emailuser', NS_SPECIAL ); |
154 | 153 | |
155 | 154 | // Add a standard footer |
156 | 155 | $footerArgs[0] = $wgSitename; |
157 | 156 | $footerArgs[1] = $from->name; |
158 | 157 | $footerArgs[2] = $to->name; |
159 | 158 | $footerArgs[3] = $prefsTitle->getFullURL(); |
160 | | - $footerArgs[4] = $emailTitle->getFullURL() . '/' . urlencode( $from->name ); // Url to Special:Emailuser/Username |
161 | 159 | $this->text = $this->text . "\n" . wfMsg( 'emailuserfooter', $footerArgs ); |
162 | 160 | |
163 | 161 | if( wfRunHooks( 'EmailUser', array( &$to, &$from, &$subject, &$this->text ) ) ) { |
Index: trunk/phase3/languages/messages/MessagesEn.php |
— | — | @@ -2017,8 +2017,7 @@ |
2018 | 2018 | 'emailuserfooter' => 'Sent automatically by $1 to $2 for $3 |
2019 | 2019 | Please note, $1 cannot be held responsible for the content of this email. |
2020 | 2020 | The option to remove yourself from these mailings is in your preferences |
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 | +Check your preferences at $4 and uncheck "Enable e-mail from other users."', |
2023 | 2022 | |
2024 | 2023 | # Watchlist |
2025 | 2024 | 'watchlist' => 'My watchlist', |