From 57f6d54fdf60a1561ab0e6fb1b93a5e4c044a4e0 Mon Sep 17 00:00:00 2001
From: Brezo Cordero <8002881+brezocordero@users.noreply.github.com>
Date: Sun, 5 Jun 2022 18:57:55 -0500
Subject: [PATCH] Add label and id also to custom fields

[MAILPOET-3331]
---
 mailpoet/lib/Form/Block/BlockRendererHelper.php | 7 ++++---
 mailpoet/lib/Form/Block/Text.php                | 7 +++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mailpoet/lib/Form/Block/BlockRendererHelper.php b/mailpoet/lib/Form/Block/BlockRendererHelper.php
index 4be6677364..d60881df8b 100644
--- a/mailpoet/lib/Form/Block/BlockRendererHelper.php
+++ b/mailpoet/lib/Form/Block/BlockRendererHelper.php
@@ -116,9 +116,10 @@ class BlockRendererHelper {
     $automationId = null;
     if (in_array($block['id'], ['email', 'last_name', 'first_name'], true)) {
       $automationId = 'data-automation-id="form_' . $block['id'] . '_label" ';
-      if (isset($formSettings['id'])) {
-        $forId = 'for="form_' . $block['id'] . '_' . $formSettings['id'] . '" ';
-      }
+    }
+
+    if (isset($formSettings['id'])) {
+      $forId = 'for="form_' . $block['id'] . '_' . $formSettings['id'] . '" ';
     }
 
     if (
diff --git a/mailpoet/lib/Form/Block/Text.php b/mailpoet/lib/Form/Block/Text.php
index 39bf9632b9..f0661209f3 100644
--- a/mailpoet/lib/Form/Block/Text.php
+++ b/mailpoet/lib/Form/Block/Text.php
@@ -42,12 +42,11 @@ class Text {
     }
 
     if (in_array($block['id'], ['email', 'last_name', 'first_name'], true)) {
-
       $automationId = 'data-automation-id="form_' . $this->wp->escAttr($block['id']) . '" ';
+    }
 
-      if (isset($formSettings['id'])) {
-        $id = 'id="form_' . $this->wp->escAttr($block['id']) . '_' . $this->wp->escAttr($formSettings['id']) . '" ';
-      }
+    if (isset($formSettings['id'])) {
+      $id = 'id="form_' . $this->wp->escAttr($block['id']) . '_' . $this->wp->escAttr($formSettings['id']) . '" ';
     }
 
     $styles = $this->inputStylesRenderer->renderForTextInput($block['styles'] ?? [], $formSettings);