diff options
| author | the_systech <the_systech@users.sourceforge.net> | 2002-01-28 21:03:25 +0000 |
|---|---|---|
| committer | the_systech <the_systech@users.sourceforge.net> | 2002-01-28 21:03:25 +0000 |
| commit | 9819d4f7777465aa9b12daf5b591592e8dc91915 (patch) | |
| tree | c9229e37247affd55b03780d7b5424f23df4b54d | |
| parent | 0a120aea728fdf61015260236fe2072f9eebdfdd (diff) | |
| download | forums-9819d4f7777465aa9b12daf5b591592e8dc91915.tar forums-9819d4f7777465aa9b12daf5b591592e8dc91915.tar.gz forums-9819d4f7777465aa9b12daf5b591592e8dc91915.tar.bz2 forums-9819d4f7777465aa9b12daf5b591592e8dc91915.tar.xz forums-9819d4f7777465aa9b12daf5b591592e8dc91915.zip | |
This should fix Bug #498451.. Keep it from including smtp.php more than once..
git-svn-id: file:///svn/phpbb/trunk@2007 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rwxr-xr-x | phpBB/includes/emailer.php | 7 | ||||
| -rw-r--r-- | phpBB/includes/smtp.php | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/phpBB/includes/emailer.php b/phpBB/includes/emailer.php index b93e61f03c..12f1ba803e 100755 --- a/phpBB/includes/emailer.php +++ b/phpBB/includes/emailer.php @@ -195,7 +195,10 @@ class emailer } if($this->use_smtp) { - include($phpbb_root_path . "includes/smtp.".$phpEx); + if(!defined('SMTP_INCLUDED')) + { + include($phpbb_root_path . "includes/smtp.".$phpEx); + } if(!smtpmail($this->address, $this->subject, $this->msg, $this->extra_headers)) { message_die(GENERAL_ERROR, "Sending via SMTP failed", "", __LINE__, __FILE__); @@ -314,4 +317,4 @@ class emailer } // class emailer -?>
\ No newline at end of file +?> diff --git a/phpBB/includes/smtp.php b/phpBB/includes/smtp.php index f14e836730..0e2cbf9e63 100644 --- a/phpBB/includes/smtp.php +++ b/phpBB/includes/smtp.php @@ -33,6 +33,7 @@ * to the opened socket to the server and the second the * response code you are looking for. ****************************************************************************/ +define('SMTP_INCLUDED', 1); function server_parse($socket, $response) { if(!($server_response = fgets($socket, 100))) |