| Index: trunk/phase3/RELEASE-NOTES-1.19 |
| — | — | @@ -37,7 +37,6 @@ |
| 38 | 38 | * New title field of Special:MovePage is now length limited on client side. |
| 39 | 39 | * (bug 28888) Searching for something starting with a # sign no longer tells |
| 40 | 40 | the user a page named [[:]] already exists. |
| 41 | | -* (bug 28960) Added more messages to Special:EmailUser. |
| 42 | 41 | * (bug 23002) Imagelinks table not updated after imagemove. |
| 43 | 42 | * (bug 27864) Transcluding {{Special:Prefix}} with empty prefix now lists all |
| 44 | 43 | pages. |
| Index: trunk/phase3/includes/specials/SpecialEmailuser.php |
| — | — | @@ -148,18 +148,8 @@ |
| 149 | 149 | if( $result === true || ( $result instanceof Status && $result->isGood() ) ) { |
| 150 | 150 | $wgOut->setPageTitle( wfMsg( 'emailsent' ) ); |
| 151 | 151 | $wgOut->addWikiMsg( 'emailsenttext' ); |
| 152 | | - if ( $status->successCount > 1 ) $wgOut->addWikiMsg( 'emailyougotcopy' ); |
| 153 | | - } elseif ( $result instanceof Status ) { |
| 154 | | - if ( $status->successCount == 0 ) { |
| 155 | | - $wgOut->setPageTitle( wfMsg( 'emailnotsent' ) ); |
| 156 | | - $wgOut->addWikiMsg( $result->getWikiText( 'emailfailed' ) ); |
| 157 | | - } elseif ( $status->failCount ) { |
| 158 | | - $wgOut->setPageTitle( wfMsg( 'emailsent' ) ); |
| 159 | | - $wgOut->addWikiMsg( 'emailsenttext' ); |
| 160 | | - $wgOut->addWikiMsg( $result->getWikiText( 'emailccfailed' ) ); |
| 161 | | - } |
| | 152 | + $wgOut->returnToMain( false, $this->mTargetObj->getUserPage() ); |
| 162 | 153 | } |
| 163 | | - $wgOut->returnToMain( false, $this->mTargetObj->getUserPage() ); |
| 164 | 154 | } |
| 165 | 155 | |
| 166 | 156 | /** |
| — | — | @@ -313,8 +303,6 @@ |
| 314 | 304 | if( !$status->isGood() ) { |
| 315 | 305 | return $status; |
| 316 | 306 | } else { |
| 317 | | - $status->successCount++; |
| 318 | | - |
| 319 | 307 | // if the user requested a copy of this mail, do this now, |
| 320 | 308 | // unless they are emailing themselves, in which case one |
| 321 | 309 | // copy of the message is sufficient. |
| — | — | @@ -326,11 +314,6 @@ |
| 327 | 315 | ); |
| 328 | 316 | wfRunHooks( 'EmailUserCC', array( &$from, &$from, &$cc_subject, &$text ) ); |
| 329 | 317 | $ccStatus = UserMailer::send( $from, $from, $cc_subject, $text ); |
| 330 | | - if ( $ccStatus->isGood() ) { |
| 331 | | - $ccStatus->successCount++; |
| 332 | | - } else { |
| 333 | | - $ccStatus->failCount++; |
| 334 | | - } |
| 335 | 318 | $status->merge( $ccStatus ); |
| 336 | 319 | } |
| 337 | 320 | |
| Index: trunk/phase3/languages/messages/MessagesQqq.php |
| — | — | @@ -2330,15 +2330,6 @@ |
| 2331 | 2331 | {{Identical|Send}}', |
| 2332 | 2332 | 'emailccme' => 'Used at [[Special:Preferences]] > E-mail', |
| 2333 | 2333 | 'emailccsubject' => 'Subject of the carbon-copied email for the sender sent through MediaWiki.', |
| 2334 | | -'emailsent' => 'Title of Special:Emailuser when it says you it sent an email', |
| 2335 | | -'emailnotsent' => 'Title of Special:Emailuser when it says you it did not sent the email', |
| 2336 | | -'emailsenttext' => 'When you send an e-mail, Special:Emailuser says you this (Your email has been sent).', |
| 2337 | | -'emailyougotcopy' => 'Shown below emailsenttext when \'e-mail em a copy\' was chosen.', |
| 2338 | | -'emailfailed' => 'Error message when sending of the main e-mail failed (cc one is not even tried). The actual error is given as parameter.', |
| 2339 | | -'emailccfailed' => 'Error message when the e-mail was sent but the user copy was not. The actual error is given as parameter.', |
| 2340 | | - |
| 2341 | | - |
| 2342 | | -'emailyougotcopy' => 'Shown below emailsenttext if you chose "send me a copy".', |
| 2343 | 2334 | 'emailuserfooter' => 'This message is appended to every email sent through the "Email user" function. |
| 2344 | 2335 | |
| 2345 | 2336 | * $1: username of the sender |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -2696,11 +2696,7 @@ |
| 2697 | 2697 | 'emailccme' => 'E-mail me a copy of my message.', |
| 2698 | 2698 | 'emailccsubject' => 'Copy of your message to $1: $2', |
| 2699 | 2699 | 'emailsent' => 'E-mail sent', |
| 2700 | | -'emailnotsent' => 'E-mail not sent', |
| 2701 | 2700 | 'emailsenttext' => 'Your e-mail message has been sent.', |
| 2702 | | -'emailyougotcopy' => 'A copy of the e-mail has been sent to you.', |
| 2703 | | -'emailfailed' => 'The e-mail could not be sent: $1', |
| 2704 | | -'emailccfailed' => 'Your e-mail copy could not be sent: $1', |
| 2705 | 2701 | 'emailuserfooter' => 'This e-mail was sent by $1 to $2 by the "E-mail user" function at {{SITENAME}}.', |
| 2706 | 2702 | |
| 2707 | 2703 | # User Messenger |