http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88119
Revision: 88119
Author: platonides
Date: 2011-05-14 22:36:19 +0000 (Sat, 14 May 2011)
Log Message:
-----------
Revert r88043. It was broken in several ways.
Modified Paths:
--------------
trunk/phase3/RELEASE-NOTES-1.19
trunk/phase3/includes/specials/SpecialEmailuser.php
trunk/phase3/languages/messages/MessagesEn.php
trunk/phase3/languages/messages/MessagesQqq.php
Modified: trunk/phase3/RELEASE-NOTES-1.19
===================================================================
--- trunk/phase3/RELEASE-NOTES-1.19 2011-05-14 22:10:10 UTC (rev 88118)
+++ trunk/phase3/RELEASE-NOTES-1.19 2011-05-14 22:36:19 UTC (rev 88119)
@@ -37,7 +37,6 @@
* New title field of Special:MovePage is now length limited on client side.
* (bug 28888) Searching for something starting with a # sign no longer tells
the user a page named [[:]] already exists.
-* (bug 28960) Added more messages to Special:EmailUser.
* (bug 23002) Imagelinks table not updated after imagemove.
* (bug 27864) Transcluding {{Special:Prefix}} with empty prefix now lists all
pages.
Modified: trunk/phase3/includes/specials/SpecialEmailuser.php
===================================================================
--- trunk/phase3/includes/specials/SpecialEmailuser.php 2011-05-14 22:10:10 UTC
(rev 88118)
+++ trunk/phase3/includes/specials/SpecialEmailuser.php 2011-05-14 22:36:19 UTC
(rev 88119)
@@ -148,18 +148,8 @@
if( $result === true || ( $result instanceof Status &&
$result->isGood() ) ) {
$wgOut->setPageTitle( wfMsg( 'emailsent' ) );
$wgOut->addWikiMsg( 'emailsenttext' );
- if ( $status->successCount > 1 ) $wgOut->addWikiMsg(
'emailyougotcopy' );
- } elseif ( $result instanceof Status ) {
- if ( $status->successCount == 0 ) {
- $wgOut->setPageTitle( wfMsg( 'emailnotsent' ) );
- $wgOut->addWikiMsg( $result->getWikiText(
'emailfailed' ) );
- } elseif ( $status->failCount ) {
- $wgOut->setPageTitle( wfMsg( 'emailsent' ) );
- $wgOut->addWikiMsg( 'emailsenttext' );
- $wgOut->addWikiMsg( $result->getWikiText(
'emailccfailed' ) );
- }
+ $wgOut->returnToMain( false,
$this->mTargetObj->getUserPage() );
}
- $wgOut->returnToMain( false, $this->mTargetObj->getUserPage() );
}
/**
@@ -313,8 +303,6 @@
if( !$status->isGood() ) {
return $status;
} else {
- $status->successCount++;
-
// if the user requested a copy of this mail, do this
now,
// unless they are emailing themselves, in which case
one
// copy of the message is sufficient.
@@ -326,11 +314,6 @@
);
wfRunHooks( 'EmailUserCC', array( &$from,
&$from, &$cc_subject, &$text ) );
$ccStatus = UserMailer::send( $from, $from,
$cc_subject, $text );
- if ( $ccStatus->isGood() ) {
- $ccStatus->successCount++;
- } else {
- $ccStatus->failCount++;
- }
$status->merge( $ccStatus );
}
Modified: trunk/phase3/languages/messages/MessagesEn.php
===================================================================
--- trunk/phase3/languages/messages/MessagesEn.php 2011-05-14 22:10:10 UTC
(rev 88118)
+++ trunk/phase3/languages/messages/MessagesEn.php 2011-05-14 22:36:19 UTC
(rev 88119)
@@ -2696,11 +2696,7 @@
'emailccme' => 'E-mail me a copy of my message.',
'emailccsubject' => 'Copy of your message to $1: $2',
'emailsent' => 'E-mail sent',
-'emailnotsent' => 'E-mail not sent',
'emailsenttext' => 'Your e-mail message has been sent.',
-'emailyougotcopy' => 'A copy of the e-mail has been sent to you.',
-'emailfailed' => 'The e-mail could not be sent: $1',
-'emailccfailed' => 'Your e-mail copy could not be sent: $1',
'emailuserfooter' => 'This e-mail was sent by $1 to $2 by the "E-mail
user" function at {{SITENAME}}.',
# User Messenger
Modified: trunk/phase3/languages/messages/MessagesQqq.php
===================================================================
--- trunk/phase3/languages/messages/MessagesQqq.php 2011-05-14 22:10:10 UTC
(rev 88118)
+++ trunk/phase3/languages/messages/MessagesQqq.php 2011-05-14 22:36:19 UTC
(rev 88119)
@@ -2330,15 +2330,6 @@
{{Identical|Send}}',
'emailccme' => 'Used at [[Special:Preferences]] > E-mail',
'emailccsubject' => 'Subject of the carbon-copied email for the sender
sent through MediaWiki.',
-'emailsent' => 'Title of Special:Emailuser when it says you it sent
an email',
-'emailnotsent' => 'Title of Special:Emailuser when it says you it did
not sent the email',
-'emailsenttext' => 'When you send an e-mail, Special:Emailuser says you
this (Your email has been sent).',
-'emailyougotcopy' => 'Shown below emailsenttext when \'e-mail em a copy\'
was chosen.',
-'emailfailed' => 'Error message when sending of the main e-mail failed
(cc one is not even tried). The actual error is given as parameter.',
-'emailccfailed' => 'Error message when the e-mail was sent but the user
copy was not. The actual error is given as parameter.',
-
-
-'emailyougotcopy' => 'Shown below emailsenttext if you chose "send me a
copy".',
'emailuserfooter' => 'This message is appended to every email sent through
the "Email user" function.
* $1: username of the sender
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
