Skip to content

Commit

Permalink
Changelog, comments, formatting
Browse files Browse the repository at this point in the history
Synchro committed Nov 5, 2013
1 parent 65ab7f1 commit 468218b
Showing 2 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -12,6 +12,7 @@
* Minor docs update
* Add Latvian translation (Thanks to @eddsstudio)
* Add Belarusian translation (Thanks to @amaksymiuk)
* Make autoloader work better on older PHP versions

## Version 5.2.7 (September 12th 2013)
* Add Ukranian translation from @Krezalis
6 changes: 4 additions & 2 deletions class.phpmailer.php
Original file line number Diff line number Diff line change
@@ -571,7 +571,8 @@ public function __construct($exceptions = false)
{
$this->exceptions = ($exceptions == true);
//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';
}
}
@@ -1866,6 +1867,7 @@ public function createBody()
if (!defined('PKCS7_TEXT')) {
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_put_contents($file, $body); //TODO check this worked
$signed = tempnam(sys_get_temp_dir(), 'signed');
@@ -3092,7 +3094,7 @@ public static function normalizeBreaks($text, $breaktype = "\r\n")


/**
* 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
* @param string $cert_filename
* @param string $key_filename

0 comments on commit 468218b

Please sign in to comment.