Use new namespaced PHPMailer exception

Fixes #25566
mantisbt · Mar 5, 2019 · 37eef75 · 37eef75
1 parent c69b096
commit 37eef75
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/core/email_api.php b/core/email_api.php
@@ -75,6 +75,7 @@
 require_api( 'utility_api.php' );
 
 use PHPMailer\PHPMailer\PHPMailer;
+use PHPMailer\PHPMailer\Exception;
 use Mantis\Exceptions\ClientException;
 
 # reusable object of class SMTP
@@ -1353,7 +1354,7 @@ function email_send( EmailData $p_email_data ) {
 	try {
 		$t_mail->AddAddress( $t_recipient, '' );
 	}
-	catch ( phpmailerException $e ) {
+	catch ( Exception $e ) { # PHPMailer exception
 		log_event( LOG_EMAIL, $t_log_msg . $t_mail->ErrorInfo );
 		$t_success = false;
 		$t_mail->ClearAllRecipients();
@@ -1401,7 +1402,7 @@ function email_send( EmailData $p_email_data ) {
 			$t_success = false;
 		}
 	}
-	catch ( phpmailerException $e ) {
+	catch ( Exception $e ) { # PHPMailer exception
 		log_event( LOG_EMAIL, $t_log_msg . $t_mail->ErrorInfo );
 		$t_success = false;
 	}