Fix Mailbox::excludeArchived() - closes #5647

2026-09-19 03:07:25 -07:00
parent 01f5a69e6a
commit dbbfff831f
1 changed files with 6 additions and 1 deletions
--- a/app/Mailbox.php
+++ b/app/Mailbox.php
@@ -1161,16 +1161,21 @@ class Mailbox extends Model
    {
        if (is_array($mailboxes)) {
            // Array.
+            $found = false;
            foreach ($mailboxes as $i => $mailbox) {
                if ($mailbox->isArchived()) {
+                    $found = true;
                    unset($mailboxes[$i]);
                }
            }
+            if ($found) {
+                $mailboxes = array_values($mailboxes);
+            }
        } else {
            // Collection.
            $mailboxes = $mailboxes->reject(function ($mailbox) {
                return $mailbox->isArchived();
-            });
+            })->values();
        }

        return $mailboxes;