Changeset 3260 for branches


Ignore:
Timestamp:
Apr 26, 2009, 5:05:07 PM (16 years ago)
Author:
rub
Message:

merge -c3259 from trunk to branch 2.0

Remove " " after ":" on smtp_mail

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/2.0/include/class_smtp_mail.inc.php

    r3058 r3260  
    116116      }
    117117
    118       $this->server_write('MAIL FROM: <'.$this->email_webmaster.'>'."\r\n");
     118      $this->server_write('MAIL FROM:<'.$this->email_webmaster.'>'."\r\n");
    119119      $this->server_parse('250');
    120120
    121121      if (preg_match('/^\s*to\s*:.*/mi', $headers) === 0)
    122122      {
    123         $to_header = 'To: '.implode(',', array_map(create_function('$email','return "<".$email.">";'), $recipients));
     123        $to_header = 'To:'.implode(',', array_map(create_function('$email','return "<".$email.">";'), $recipients));
    124124      }
    125125      else
    … …  
    131131      while (list(, $email) = @each($recipients))
    132132      {
    133         $this->server_write('RCPT TO: <'.$email.'>'."\r\n");
     133        $this->server_write('RCPT TO:<'.$email.'>'."\r\n");
    134134        $this->server_parse('250');
    135135      }
    … …  
    138138      $this->server_parse('354');
    139139
    140       $this->server_write('Subject: '.$subject."\r\n".(empty($to_header) ? "" : $to_header."\r\n").$headers."\r\n\r\n".$message."\r\n");
     140      $this->server_write('Subject:'.$subject."\r\n".(empty($to_header) ? "" : $to_header."\r\n").$headers."\r\n\r\n".$message."\r\n");
    141141      $this->server_write('.'."\r\n");
    142142      $this->server_parse('250');
Note: See TracChangeset for help on using the changeset viewer.