Address #64

AndrewPoppe · Feb 21, 2024 · f646356 · f646356
1 parent 76d6cdc
commit f646356
Showing 1 changed file with 10 additions and 2 deletions.
diff --git 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()