Skip to content

[stable5.10] fix(outbox): reset status and failure flag on message update #13137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChristophWurst merged 1 commit into from
Jun 22, 2026
Merged

[stable5.10] fix(outbox): reset status and failure flag on message update #13137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions lib/Controller/OutboxController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@ public function createFromDraft(DraftsService $draftsService, int $id, int $send
* @param string $body
* @param string $editorBody
* @param bool $isHtml
* @param bool $failed
* @param array $to i. e. [['label' => 'Linus', 'email' => 'tent@stardewvalley.com'], ['label' => 'Pierre', 'email' => 'generalstore@stardewvalley.com']]
* @param array $cc
* @param array $bcc
Expand All @@ -198,7 +197,6 @@ public function update(
bool $isHtml,
bool $smimeSign,
bool $smimeEncrypt,
bool $failed = false,
array $to = [],
array $cc = [],
array $bcc = [],
Expand Down Expand Up @@ -231,6 +229,10 @@ public function update(
$message->setSmimeEncrypt($smimeEncrypt);
$message->setRequestMdn($requestMdn);

// Reset the status to make it retryable.
$message->setFailed(false);
$message->setStatus(LocalMessage::STATUS_RAW);

if (!empty($smimeCertificateId)) {
$smimeCertificate = $this->smimeService->findCertificate($smimeCertificateId, $effectiveUserId);
$message->setSmimeCertificateId($smimeCertificate->getId());
Expand Down
4 changes: 0 additions & 4 deletions tests/Unit/Controller/OutboxControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,6 @@ public function testUpdate(): void {
$message->isHtml(),
$message->getSmimeSign(),
$message->getSmimeEncrypt(),
false,
$to,
$cc,
[],
Expand Down Expand Up @@ -533,7 +532,6 @@ public function testUpdateMessageNotFound(): void {
$message->isHtml(),
$message->getSmimeSign(),
$message->getSmimeEncrypt(),
false,
$to,
$cc,
[],
Expand Down Expand Up @@ -588,7 +586,6 @@ public function testUpdateDbException(): void {
$message->isHtml(),
$message->getSmimeSign(),
$message->getSmimeEncrypt(),
false,
$to,
$cc,
[],
Expand Down Expand Up @@ -688,7 +685,6 @@ public function testUpdateValidateCertificateId(): void {
$message->isHtml(),
$message->getSmimeSign(),
$message->getSmimeEncrypt(),
false,
$to,
$cc,
[],
Expand Down
Loading