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

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

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

revision 1.1.2.1.2.7 by smk, Wed Nov 4 20:29:02 2009 UTC revision 1.1.2.1.2.8 by smk, Sat Nov 21 17:37:38 2009 UTC
# Line 1  Line 1 
1  <?php  <?php
2  // $Id: phpmailer.drupal.inc,v 1.1.2.1.2.6 2009/11/04 20:14:40 smk Exp $  // $Id: phpmailer.drupal.inc,v 1.1.2.1.2.7 2009/11/04 20:29:02 smk Exp $
3    
4  /**  /**
5   * @file   * @file
# Line 121  function phpmailer_send($to, $subject, $ Line 121  function phpmailer_send($to, $subject, $
121    $mail->Subject = $subject;    $mail->Subject = $subject;
122    $mail->Body = $body;    $mail->Body = $body;
123    
124    if ($mail->SMTPDebug) {    return $mail->Send();
     ob_start();  
   }  
   
   if (!($result = $mail->Send())) {  
     watchdog('phpmailer', t('Error sending e-mail (from %from to %to): %error.', array('%from' => $from, '%to' => $to, '%error' => $mail->ErrorInfo)), WATCHDOG_ERROR);  
   }  
   
   if ($mail->SMTPDebug) {  
     if ($debug = ob_get_contents()) {  
       drupal_set_message($debug);  
     }  
     ob_end_clean();  
   }  
   
   return $result;  
125  }  }
126    
Legend:
Removed from v.1.1.2.1.2.7  
changed lines
  Added in v.1.1.2.1.2.8
  ViewVC Help
Powered by ViewVC 1.1.3