From 2b6384aa7708cdf2345da768b0446b02768db85d Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Wed, 5 Jun 2024 14:58:39 +0000
Subject: [PATCH] sort mails in mailqueue by tries and mkdate, closes #3524

Closes #3524

Merge request studip/studip!2409
---
 lib/models/MailQueueEntry.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/models/MailQueueEntry.class.php b/lib/models/MailQueueEntry.class.php
index bc956e78f70..d0f96854337 100644
--- a/lib/models/MailQueueEntry.class.php
+++ b/lib/models/MailQueueEntry.class.php
@@ -104,7 +104,7 @@ class MailQueueEntry extends SimpleORMap
 
             $status_messages[] = $status_message;
         }, "tries = 0 " .
-           "OR (last_try > (UNIX_TIMESTAMP() - 60 * 60) AND tries < 25) ORDER BY mkdate".
+           "OR (last_try > (UNIX_TIMESTAMP() - 60 * 60) AND tries < 25) ORDER BY tries, mkdate".
            ($limit > 0 ? " LIMIT ". (int) $limit : "")
         );
 
-- 
GitLab