aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrub <rub@piwigo.org>2009-04-26 15:05:07 +0000
committerrub <rub@piwigo.org>2009-04-26 15:05:07 +0000
commit6d758aec6b7bdb04766de8414814da55fe3e28e3 (patch)
treeba110e4f178b1633b3d70b3df7448c97c24f99e3
parentef20fa17b5c6da034f57db52b1a2f198059762d9 (diff)
merge -c3259 from trunk to branch 2.0
Remove " " after ":" on smtp_mail git-svn-id: http://piwigo.org/svn/branches/2.0@3260 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--include/class_smtp_mail.inc.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/class_smtp_mail.inc.php b/include/class_smtp_mail.inc.php
index 0e8ee9779..9ace931db 100644
--- a/include/class_smtp_mail.inc.php
+++ b/include/class_smtp_mail.inc.php
@@ -115,12 +115,12 @@ class smtp_mail
$this->server_parse('250');
}
- $this->server_write('MAIL FROM: <'.$this->email_webmaster.'>'."\r\n");
+ $this->server_write('MAIL FROM:<'.$this->email_webmaster.'>'."\r\n");
$this->server_parse('250');
if (preg_match('/^\s*to\s*:.*/mi', $headers) === 0)
{
- $to_header = 'To: '.implode(',', array_map(create_function('$email','return "<".$email.">";'), $recipients));
+ $to_header = 'To:'.implode(',', array_map(create_function('$email','return "<".$email.">";'), $recipients));
}
else
{
@@ -130,14 +130,14 @@ class smtp_mail
@reset($recipients);
while (list(, $email) = @each($recipients))
{
- $this->server_write('RCPT TO: <'.$email.'>'."\r\n");
+ $this->server_write('RCPT TO:<'.$email.'>'."\r\n");
$this->server_parse('250');
}
$this->server_write('DATA'."\r\n");
$this->server_parse('354');
- $this->server_write('Subject: '.$subject."\r\n".(empty($to_header) ? "" : $to_header."\r\n").$headers."\r\n\r\n".$message."\r\n");
+ $this->server_write('Subject:'.$subject."\r\n".(empty($to_header) ? "" : $to_header."\r\n").$headers."\r\n\r\n".$message."\r\n");
$this->server_write('.'."\r\n");
$this->server_parse('250');