/[drupal]/contributions/modules/phpmailer/includes/phpmailer.mimemail.inc
ViewVC logotype

Diff of /contributions/modules/phpmailer/includes/phpmailer.mimemail.inc

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.1.2.1.2.4 by smk, Wed Nov 4 19:33:11 2009 UTC revision 1.1.2.1.2.5 by smk, Sat Nov 21 17:37:38 2009 UTC
# Line 1  Line 1 
1  <?php  <?php
2  // $Id: phpmailer.mimemail.inc,v 1.1.2.1.2.3 2009/11/04 15:40:49 smk Exp $  // $Id: phpmailer.mimemail.inc,v 1.1.2.1.2.4 2009/11/04 19:33:11 smk Exp $
3    
4  /**  /**
5   * @file   * @file
# Line 57  function mimemail_phpmailer_send($messag Line 57  function mimemail_phpmailer_send($messag
57    }    }
58    unset($message['headers']['CC'], $message['headers']['BCC']);    unset($message['headers']['CC'], $message['headers']['BCC']);
59    
   if ($mail->SMTPDebug) {  
     ob_start();  
   }  
   
60    $message['headers']['Date'] = $mail->RFCDate();    $message['headers']['Date'] = $mail->RFCDate();
61    if ($message['address']) {    if ($message['address']) {
62      $message['headers']['To'] = $message['address'];      $message['headers']['To'] = $message['address'];
# Line 72  function mimemail_phpmailer_send($messag Line 68  function mimemail_phpmailer_send($messag
68  //  }  //  }
69    $header = mimemail_rfc_headers($message['headers']) . $mail->LE . $mail->LE;    $header = mimemail_rfc_headers($message['headers']) . $mail->LE . $mail->LE;
70    
71    if (!($result = $mail->SmtpSend($header, $message['body']))) {    return $mail->SmtpSend($header, $message['body']);
     watchdog('phpmailer', t('Error sending e-mail (from %from to %to): %error.', array('%from' => $message['sender'], '%to' => $message['address'], '%error' => $mail->ErrorInfo)), WATCHDOG_ERROR);  
   }  
   
   if ($mail->SMTPDebug) {  
     if ($debug = ob_get_contents()) {  
       drupal_set_message($debug);  
     }  
     ob_end_clean();  
   }  
   
   return $result;  
72  }  }
73    
Legend:
Removed from v.1.1.2.1.2.4  
changed lines
  Added in v.1.1.2.1.2.5
  ViewVC Help
Powered by ViewVC 1.1.3