mirror/PHPMailer
0
0
Fork 0
mirror of https://github.com/PHPMailer/PHPMailer.git synced 2024-09-20 01:52:15 +02:00
Code

Changelog, comments, formatting

Browse Source
This commit is contained in:
Synchro 2013-11-05 23:02:53 +01:00
parent 65ab7f15f7
commit 468218baba
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.md
View File

@ -12,6 +12,7 @@
* Minor docs update * Minor docs update
* Add Latvian translation (Thanks to @eddsstudio) * Add Latvian translation (Thanks to @eddsstudio)
* Add Belarusian translation (Thanks to @amaksymiuk) * Add Belarusian translation (Thanks to @amaksymiuk)
* Make autoloader work better on older PHP versions
## Version 5.2.7 (September 12th 2013) ## Version 5.2.7 (September 12th 2013)
* Add Ukranian translation from @Krezalis * Add Ukranian translation from @Krezalis

6
class.phpmailer.php
View File

@ -571,7 +571,8 @@ class PHPMailer
{ {
$this->exceptions = ($exceptions == true); $this->exceptions = ($exceptions == true);
//Make sure our autoloader is loaded //Make sure our autoloader is loaded
if (version_compare(PHP_VERSION, '5.1.2', '>=') and !spl_autoload_functions() || !in_array('PHPMailerAutoload', spl_autoload_functions())) { if (version_compare(PHP_VERSION, '5.1.2', '>=') and
!spl_autoload_functions() || !in_array('PHPMailerAutoload', spl_autoload_functions())) {
require 'PHPMailerAutoload.php'; require 'PHPMailerAutoload.php';
} }
} }
@ -1866,6 +1867,7 @@ class PHPMailer
if (!defined('PKCS7_TEXT')) { if (!defined('PKCS7_TEXT')) {
throw new phpmailerException($this->lang('signing') . ' OpenSSL extension missing.'); throw new phpmailerException($this->lang('signing') . ' OpenSSL extension missing.');
} }
//TODO would be nice to use php://temp streams here, but need to wrap for PHP < 5.1
$file = tempnam(sys_get_temp_dir(), 'mail'); $file = tempnam(sys_get_temp_dir(), 'mail');
file_put_contents($file, $body); //TODO check this worked file_put_contents($file, $body); //TODO check this worked
$signed = tempnam(sys_get_temp_dir(), 'signed'); $signed = tempnam(sys_get_temp_dir(), 'signed');
@ -3092,7 +3094,7 @@ class PHPMailer
/** /**
* Set the private key file and password for S/MIME signing. * Set the public and private key files and password for S/MIME signing.
* @access public * @access public
* @param string $cert_filename * @param string $cert_filename
* @param string $key_filename * @param string $key_filename