iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-03-28 17:42:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes #904 avoid warnings on PHP 7.2+ with PHPMailer (without updating PHPMailer)

Browse Source
This commit is contained in:
plegall
2019-06-21 15:02:02 +02:00
parent 46781c191a
commit 4195572563
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/functions_mail.inc.php
View File

@@ -605,7 +605,14 @@ function pwg_mail($to, $args=array(), $tpl=array())
$conf_mail = get_mail_configuration();
}
include_once(PHPWG_ROOT_PATH.'include/phpmailer/PHPMailerAutoload.php');
// 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');
$mail = new PHPMailer;