Update PHPMailer to 5.2.23 via Composer

Fixes #22940
mantisbt · Jun 4, 2017 · 9cbc85e · 9cbc85e
1 parent afea93e
commit 9cbc85e
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -7,6 +7,7 @@
         "guzzlehttp/guzzle": "^6.2",
         "vboctor/disposable_email_checker": "^3.0",
         "adodb/adodb-php": "^5.20",
+        "phpmailer/phpmailer": "^5.2",
         "erusev/parsedown": "^1.6"
     },
     "license": "GPL v2",

diff --git a/composer.lock b/composer.lock
diff --git a/core/email_api.php b/core/email_api.php
@@ -74,8 +74,6 @@
 require_api( 'user_pref_api.php' );
 require_api( 'utility_api.php' );
 
-require_lib( 'phpmailer/PHPMailerAutoload.php' );
-
 # reusable object of class SMTP
 $g_phpMailer = null;
 

diff --git a/library/README.md b/library/README.md
@@ -9,7 +9,6 @@ The version and status of each is summarized below:
 
 directory       | project         | version   | status
 ----------------|-----------------|-----------|---------------
-phpmailer       | PHPMailer       | 5.2.22    | unpatched [1]
 rssbuilder      | RSSBuilder      | 2.2.1     | patched [2]
 utf8            | phputf8         | 0.5       | unpatched
 securimage      | PHP Captcha     | 3.6.5     | patched [1]
@@ -43,7 +42,6 @@ Upstream projects
 
 project         | URL
 ----------------|--------------------------------------------------------------------
-phpmailer       | https://github.com/PHPMailer/PHPMailer
 rssbuilder      | http://code.google.com/p/flaimo-php/
 utf8            | http://sourceforge.net/projects/phputf8
 secureimage     | http://www.phpcaptcha.org/ - https://github.com/mantisbt/securimage

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