[Phpbb-checkins] CVS: phpBB2/includes emailer.php,1.9,1.10 smtp.php,1.6,1.7

[Jonathan H. <the...@us...>]

Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv18119

Modified Files:
	emailer.php smtp.php 
Log Message:
This should fix Bug #498451.. Keep it from including smtp.php more than once..


Index: emailer.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/emailer.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** emailer.php	2001/11/26 00:50:03	1.9
--- emailer.php	2002/01/28 21:03:25	1.10
***************
*** 196,200 ****
  			if($this->use_smtp)
  			{
! 				include($phpbb_root_path . "includes/smtp.".$phpEx);
  				if(!smtpmail($this->address, $this->subject, $this->msg, $this->extra_headers))
  				{
--- 196,203 ----
  			if($this->use_smtp)
  			{
! 				if(!defined('SMTP_INCLUDED')) 
! 				{
! 					include($phpbb_root_path . "includes/smtp.".$phpEx);
! 				}
  				if(!smtpmail($this->address, $this->subject, $this->msg, $this->extra_headers))
  				{
***************
*** 315,317 ****
  } // class emailer
  
! ?>
\ No newline at end of file
--- 318,320 ----
  } // class emailer
  
! ?>

Index: smtp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/smtp.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** smtp.php	2002/01/04 17:25:54	1.6
--- smtp.php	2002/01/28 21:03:25	1.7
***************
*** 34,37 ****
--- 34,38 ----
  *						response code you are looking for.
  ****************************************************************************/
+ define('SMTP_INCLUDED', 1);
  function server_parse($socket, $response)
  {