adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-06 16:53:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

issue #1417 update PHPMailer from 5.2.21 to 6.5.1

Browse Source 
Requires PHP 5.5, but Piwigo 12 is now requiring PHP 7 so it's fine.
This commit is contained in:
plegall
2021-08-22 19:54:58 +02:00
parent b129468627
commit 731fd2b4e4
8 changed files with 6276 additions and 4492 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions_mail.inc.php
+3 -8
View File
@@ -10,6 +10,7 @@
* @package functions\mail
*/
use PHPMailer\PHPMailer\PHPMailer;
/**
* Returns the name of the mail sender
@@ -605,14 +606,8 @@ function pwg_mail($to, $args=array(), $tpl=array())
$conf_mail = get_mail_configuration();
}
// PHPMailer autoloader shows warnings with PHP 7.2. Solution to upgrade to PHPMailer 6
// implies requiring PHP 5.5, which is bigger than current requirement for Piwigo.
//
// include_once(PHPWG_ROOT_PATH.'include/phpmailer/PHPMailerAutoload.php');
//
// replace by direct include of the classes:
include_once(PHPWG_ROOT_PATH.'include/phpmailer/class.smtp.php');
include_once(PHPWG_ROOT_PATH.'include/phpmailer/class.phpmailer.php');
include_once(PHPWG_ROOT_PATH.'include/phpmailer/SMTP.php');
include_once(PHPWG_ROOT_PATH.'include/phpmailer/PHPMailer.php');
$mail = new PHPMailer;