From 2b37740eaf766bbc2c6eb4056969bf2f7bff19bd Mon Sep 17 00:00:00 2001
From: Sebastian Leu <sebastian.leu@protonmail.com>
Date: Mon, 7 Apr 2025 16:43:56 +0700
Subject: [PATCH] Issue #3517681: Load status code saved on entity as default
 if available

---
 src/Form/RegexRedirectForm.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Form/RegexRedirectForm.php b/src/Form/RegexRedirectForm.php
index e9db9bc..7040fce 100644
--- a/src/Form/RegexRedirectForm.php
+++ b/src/Form/RegexRedirectForm.php
@@ -51,8 +51,6 @@ class RegexRedirectForm extends ContentEntityForm {
 
     $form = parent::form($form, $form_state);
 
-    $default_code = $redirect->getDefaultStatusCode();
-
     $form['regex_message'] = [
       '#type' => 'markup',
       '#markup' => $this->t(
@@ -80,7 +78,7 @@ class RegexRedirectForm extends ContentEntityForm {
     $form['status_code'] = [
       '#type' => 'select',
       '#title' => $this->t('Redirect status'),
-      '#default_value' => $default_code,
+      '#default_value' => $redirect->get('status_code')->value ?: $redirect->getDefaultStatusCode(),
       '#options' => regex_redirect_status_code_options(),
     ];
 
-- 
GitLab