[Netoffice-cvs-2x] netoffice-2.x/includes/phpmailer class.phpmailer.php,1.2,1.3

[Scott M. <ma...@us...>]

Update of /cvsroot/netoffice/netoffice-2.x/includes/phpmailer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10030/includes/phpmailer

Modified Files:
	class.phpmailer.php 
Log Message:
bug fixes

Index: class.phpmailer.php
===================================================================
RCS file: /cvsroot/netoffice/netoffice-2.x/includes/phpmailer/class.phpmailer.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** class.phpmailer.php	3 Dec 2004 19:34:35 -0000	1.2
--- class.phpmailer.php	24 Jun 2005 21:34:39 -0000	1.3
***************
*** 430,434 ****
          {
              $old_from = ini_get("sendmail_from");
!             ini_set("sendmail_from", $this->Sender);
              $params = sprintf("-oi -f %s", $this->Sender);
              $rt = @mail($to, $this->EncodeHeader($this->Subject), $body, 
--- 430,434 ----
          {
              $old_from = ini_get("sendmail_from");
!             @ini_set("sendmail_from", $this->Sender);
              $params = sprintf("-oi -f %s", $this->Sender);
              $rt = @mail($to, $this->EncodeHeader($this->Subject), $body, 
***************
*** 439,443 ****
  
          if (isset($old_from))
!             ini_set("sendmail_from", $old_from);
  
          if(!$rt)
--- 439,443 ----
  
          if (isset($old_from))
!             @ini_set("sendmail_from", $old_from);
  
          if(!$rt)