Author: Derick Rethans
Date: 2006-01-23 09:52:03 +0100 (Mon, 23 Jan 2006)
New Revision: 1998
Log:
- Fixed bug #7716: ezcMail sets Reply-To header implicitly.
Modified:
packages/Mail/trunk/src/mail.php
packages/Mail/trunk/tests/mail_test.php
Modified: packages/Mail/trunk/src/mail.php
===================================================================
--- packages/Mail/trunk/src/mail.php 2006-01-22 23:22:41 UTC (rev 1997)
+++ packages/Mail/trunk/src/mail.php 2006-01-23 08:52:03 UTC (rev 1998)
@@ -249,7 +249,6 @@
{
// set our headers first.
$this->setHeader( "From", ezcMailTools::composeEmailAddress(
$this->from ) );
- $this->setHeader( "Reply-To", ezcMailTools::composeEmailAddress(
$this->from ) );
$this->setHeader( "To", ezcMailTools::composeEmailAddresses( $this->to
) );
if ( count( $this->cc ) )
{
Modified: packages/Mail/trunk/tests/mail_test.php
===================================================================
--- packages/Mail/trunk/tests/mail_test.php 2006-01-22 23:22:41 UTC (rev
1997)
+++ packages/Mail/trunk/tests/mail_test.php 2006-01-23 08:52:03 UTC (rev
1998)
@@ -61,7 +61,6 @@
$this->mail->addBcc( new ezcMailAddress( '[EMAIL PROTECTED]' ) );
$expected = "From: [EMAIL PROTECTED]" . ezcMailTools::lineBreak() .
- "Reply-To: [EMAIL PROTECTED]" . ezcMailTools::lineBreak() .
"To: Frederik Holljen <[EMAIL PROTECTED]>, [EMAIL PROTECTED]" .
ezcMailTools::lineBreak() .
"Cc: Derick Rethans <[EMAIL PROTECTED]>" .
ezcMailTools::lineBreak() .
"Bcc: [EMAIL PROTECTED]" . ezcMailTools::lineBreak() .
@@ -71,8 +70,7 @@
$return = $this->mail->generate();
// cut away the Date and Message-ID headers as there is no way to
predict what they will be
- $return = join( ezcMailTools::lineBreak(), array_slice( explode(
ezcMailTools::lineBreak(), $return ), 0, 8 ) );
-
+ $return = join( ezcMailTools::lineBreak(), array_slice( explode(
ezcMailTools::lineBreak(), $return ), 0, 7 ) );
$this->assertEquals( $expected, $return );
}
@@ -83,7 +81,6 @@
$this->mail->subject = "Døtte er en test";
$this->mail->subjectCharset = 'iso-8859-1';
$expected = "From: [EMAIL PROTECTED]" . ezcMailTools::lineBreak() .
- "Reply-To: [EMAIL PROTECTED]" . ezcMailTools::lineBreak() .
"To: Frederik Holljen <[EMAIL PROTECTED]>" .
ezcMailTools::lineBreak() .
"Subject: =?ISO-8859-1?B?RPh0dGUgZXIgZW4gdGVzdA==?=" .
ezcMailTools::lineBreak() .
"MIME-Version: 1.0" . ezcMailTools::lineBreak() .
@@ -91,7 +88,7 @@
$return = $this->mail->generate();
// cut away the Date and Message-ID headers as there is no way to
predict what they will be
- $return = join( ezcMailTools::lineBreak(), array_slice( explode(
ezcMailTools::lineBreak(), $return ), 0, 6 ) );
+ $return = join( ezcMailTools::lineBreak(), array_slice( explode(
ezcMailTools::lineBreak(), $return ), 0, 5 ) );
$this->assertEquals( $expected, $return );
}
@@ -105,7 +102,6 @@
$this->mail->subject = "Døtte er en test";
$this->mail->subjectCharset = 'iso-8859-1';
$expected = "From: =?ISO-8859-1?B?RnLmZGVyaWsgSPhsbGplbg==?= <[EMAIL
PROTECTED]>" . ezcMailTools::lineBreak() .
- "Reply-To: =?ISO-8859-1?B?RnLmZGVyaWsgSPhsbGplbg==?= <[EMAIL
PROTECTED]>" . ezcMailTools::lineBreak() .
"To: =?ISO-8859-1?B?RnLmZGVyaWsgSPhsbGplbg==?= <[EMAIL
PROTECTED]>" . ezcMailTools::lineBreak() .
"Cc: =?ISO-8859-1?B?RnLmZGVyaWsgSPhsbGplbg==?= <[EMAIL
PROTECTED]>" . ezcMailTools::lineBreak() .
"Bcc: =?ISO-8859-1?B?RnLmZGVyaWsgSPhsbGplbg==?= <[EMAIL
PROTECTED]>" . ezcMailTools::lineBreak() .
@@ -115,7 +111,7 @@
$return = $this->mail->generate();
// cut away the Date and Message-ID headers as there is no way to
predict what they will be
- $return = join( ezcMailTools::lineBreak(), array_slice( explode(
ezcMailTools::lineBreak(), $return ), 0, 8 ) );
+ $return = join( ezcMailTools::lineBreak(), array_slice( explode(
ezcMailTools::lineBreak(), $return ), 0, 7 ) );
$this->assertEquals( $expected, $return );
}
--
svn-components mailing list
[email protected]
http://lists.ez.no/mailman/listinfo/svn-components
