Upgrade PHPMailer to 5.2.9

See changelog.md for full details Fixes #17717
mantisbt · Apr 18, 2015 · 4c3ce1a · 4c3ce1a
1 parent 3b58440
commit 4c3ce1a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/config_defaults_inc.php b/config_defaults_inc.php
@@ -550,7 +550,7 @@
  *   standard-compliant, with this you can.
  * - EMAIL_VALIDATE_AUTO: let PHPMailer's
  *   {@link http://phpmailer.github.io/PHPMailer/classes/PHPMailer.html#method_validateAddress validateAddress()}
- *   method pick the best validation pattern. As of PHPMailer v5.2.8 on recent
+ *   method pick the best validation pattern. As of PHPMailer v5.2.9, on recent
  *   systems, this is generally the same as EMAIL_VALIDATE_RFC5322.
  * - OFF: disable email validation
  *

diff --git a/core/email_api.php b/core/email_api.php
@@ -47,7 +47,7 @@
  * @uses user_pref_api.php
  * @uses utility_api.php
  *
- * @uses class.phpmailer.php PHPMailer library
+ * @uses PHPMailerAutoload.php PHPMailer library
  */
 
 require_api( 'access_api.php' );
@@ -74,7 +74,7 @@
 require_api( 'user_pref_api.php' );
 require_api( 'utility_api.php' );
 
-require_lib( 'phpmailer' . DIRECTORY_SEPARATOR . 'class.phpmailer.php' );
+require_lib( 'phpmailer/PHPMailerAutoload.php' );
 
 # reusable object of class SMTP
 $g_phpMailer = null;

diff --git a/docbook/Admin_Guide/en-US/config/email.xml b/docbook/Admin_Guide/en-US/config/email.xml
@@ -177,7 +177,7 @@
 						<ulink url="http://phpmailer.github.io/PHPMailer/classes/PHPMailer.html#method_validateAddress">
 							validateAddress() method</ulink>
 						pick the best validation pattern.
-						As of PHPMailer v5.2.8 on recent systems, this is
+						As of PHPMailer v5.2.9 on recent systems, this is
 						generally the same as
 						<literal>EMAIL_VALIDATE_RFC5322</literal>.
 					</para></listitem>

diff --git a/library/README.libs b/library/README.libs
@@ -8,7 +8,7 @@ directory       | project         | version   | status
 adodb           | adodb           | v5.19     | patched [1][3]
 disposable      | disposable      | 1.1.0     | unpatched
 ezc             | ez Components   | 2009.2.1  | unpatched
-phpmailer       | PHPMailer       | 5.2.8     | unpatched [1]
+phpmailer       | PHPMailer       | 5.2.9     | unpatched [1]
 rssbuilder      | RSSBuilder      | 2.2.1     | patched [2]
 utf8            | phputf8         | 0.5       | unpatched
 securimage      | PHP Captcha     | 3.5.4     | unpatched [1]

diff --git a/library/phpmailer b/library/phpmailer