From f64635632a1c13990f0fedce55e4cd51aad64cfc Mon Sep 17 00:00:00 2001 From: AndrewPoppe Date: Wed, 21 Feb 2024 14:55:18 -0500 Subject: [PATCH] Address #64 --- classes/Alert.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/classes/Alert.php b/classes/Alert.php index aea4f006..c71b9c84 100644 --- a/classes/Alert.php +++ b/classes/Alert.php @@ -227,13 +227,21 @@ private function sendUserRightsHoldersAlertsAndScheduleReminders() private function sendUserExpirationAlertsAndScheduleReminders() { + $errorMessage = false; if ( $this->getSendUserNotification() ) { - return $this->sendUserExpirationUserAlertsAndScheduleReminders(); + $errorMessage = $this->sendUserExpirationUserAlertsAndScheduleReminders(); } if ( $this->getSendNotificationUserExpirationUserRightsHolders() ) { - return $this->sendUserExpirationUserRightsHoldersAlertsAndScheduleReminders(); + $userRightsHolderError = $this->sendUserExpirationUserRightsHoldersAlertsAndScheduleReminders(); + if ( $errorMessage && $userRightsHolderError ) { + $errorMessage .= '; ' . $userRightsHolderError; + } elseif ( $userRightsHolderError ) { + $errorMessage = $userRightsHolderError; + } } + + return $errorMessage; } private function sendUserExpirationUserAlertsAndScheduleReminders()