From ca9e69c6518e4db0ea7a17a27b0f8c505e79f705 Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Fri, 22 Mar 2024 15:35:09 +0000
Subject: [PATCH] fix for BIESt 3523, closes #3523
Closes #3523
Merge request studip/studip!2408
---
lib/models/MailQueueEntry.class.php | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/lib/models/MailQueueEntry.class.php b/lib/models/MailQueueEntry.class.php
index 7fe63f67ea8..bc956e78f70 100644
--- a/lib/models/MailQueueEntry.class.php
+++ b/lib/models/MailQueueEntry.class.php
@@ -123,15 +123,19 @@ class MailQueueEntry extends SimpleORMap
{
$mail = new StudipMail($this->mail);
- $success = $mail->send();
- if ($success) {
- $this->delete();
+ if ($mail->getRecipients()) {
+ $success = $mail->send();
+ if ($success) {
+ $this->delete();
+ } else {
+ $this['tries'] = $this['tries'] + 1;
+ $this['last_try'] = time();
+ $this->store();
+ }
} else {
- $this['tries'] = $this['tries'] + 1;
- $this['last_try'] = time();
- $this->store();
+ $success = false;
+ $this->delete();
}
-
return $success;
}
}
--
GitLab