Quick Search:

Mode

Context

Displaying 3 lines of context. None | Less | More | Full

Other Diffs

Ignore

Blank Lines Whitespace:

Diff

1518
 
1519
 
1519
 
mail.php
_> 2525         $_boundary,
  2626         $_headers = array('X-Mailer' => 'osCommerce'),
  2727         $_body,
<> 28 -        $_body_processed,
2928         $_content_transfer_encoding = '7bit',
  3029         $_charset = 'iso-8859-1';
  3130 
     
 !
7877 
  7978     function setBodyPlain($body) {
  8079       $this->_body_plain = wordwrap($body, 78, "\r\n", false);
<> 81 -      $this->_body_processed = null;
   80+      $this->_body = null;
8281     }
  8382 
  8483     function setBodyHTML($body) {
  8584       $this->_body_html = wordwrap($body, 998, "\r\n", true);
<> 86 -      $this->_body_processed = null;
   85+      $this->_body = null;
8786     }
  8887 
  8988     function setContentTransferEncoding($encoding) {
     
 !
138137     }
  139138 
  140139     function send() {
<> 141 -      if ( empty($this->_body_processed) ) {
   140+      if ( empty($this->_body) ) {
142141         if ( !empty($this->_body_plain) && !empty($this->_body_html) ) {
  143142           $this->_boundary = '=_____MULTIPART_MIXED_BOUNDARY____';
  144143           $this->_related_boundary = '=_____MULTIPART_RELATED_BOUNDARY____';
     
 !
259258         } else {
  260259           $this->_body = $this->_body_plain . "\n";
  261260         }
<> 262 -
  263 -        $this->_body_processed = $this->_body;
<_ 264261       }
  265262 
  266263       $to_email_addresses = array();