From: Platonides <platonides@users.mediawiki.org>
Date: Sat, 14 May 2011 22:36:19 +0000 (+0000)
Subject: Revert r88043. It was broken in several ways.
X-Git-Tag: 1.31.0-rc.0~30183
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=fd435a9c205e2b6c14741d29109793610a27e69f;p=lhc%2Fweb%2Fwiklou.git

Revert r88043. It was broken in several ways.
---

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index 2874e5bf1d..9a55d4b4f2 100644
--- a/RELEASE-NOTES-1.19
+++ b/RELEASE-NOTES-1.19
@@ -37,7 +37,6 @@ used in Tiff files.
 * 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.
diff --git a/includes/specials/SpecialEmailuser.php b/includes/specials/SpecialEmailuser.php
index 22bc254a4d..b3ba9c5cf5 100644
--- a/includes/specials/SpecialEmailuser.php
+++ b/includes/specials/SpecialEmailuser.php
@@ -148,18 +148,8 @@ class SpecialEmailUser extends UnlistedSpecialPage {
 		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 @@ class SpecialEmailUser extends UnlistedSpecialPage {
 		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 @@ class SpecialEmailUser extends UnlistedSpecialPage {
 				);
 				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 );
 			}
 
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 3fcc672685..a9d2ad2cc2 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2696,11 +2696,7 @@ The e-mail address you entered in [[Special:Preferences|your user preferences]]
 '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
diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index 4e20402eb0..0c03259949 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -2330,15 +2330,6 @@ This is a button text used in [[Special:Emailuser]] when called without a (valid
 {{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