Merge remote-tracking branch 'origin/AC-15185' into spartans_pr_26082025

Author: glo60612

app/code/Magento/Customer/view/frontend/templates/form/register.phtml

@@ -1,20 +1,16 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
  */
 
 use Magento\Customer\Helper\Address;
 
 /** @var \Magento\Customer\Block\Form\Register $block */
-if (!$block->getButtonLockManager()) {
-    $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-    $block->setButtonLockManager(
-        $objectManager->get(\Magento\Framework\View\Element\ButtonLockManager::class)
-    );
-}
 /** @var \Magento\Framework\Escaper $escaper */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/** @var \Magento\Framework\View\Element\ButtonLockManager|null $buttonLockManager */
+$buttonLockManager = $block->getButtonLockManager();
 
 /** @var Magento\Customer\Helper\Address $addressHelper */
 $addressHelper = $block->getData('addressHelper');
@@ -33,7 +29,8 @@ $formData = $block->getFormData();
       method="post"
       id="form-validate"
       enctype="multipart/form-data"
-      autocomplete="off">
+      autocomplete="off"
+      data-mage-init='{"validation":{"errorClass":"mage-error","errorElement":"div"}}'>
     <?= /* @noEscape */ $block->getBlockHtml('formkey') ?>
     <fieldset class="fieldset create info">
         <legend class="legend"><span><?= $escaper->escapeHtml(__('Personal Information')) ?></span></legend><br>
@@ -300,7 +297,7 @@ $formData = $block->getFormData();
                     class="action submit primary"
                     title="<?= $escaper->escapeHtmlAttr(__('Create an Account')) ?>"
                     id="send2"
-                <?php if ($block->getButtonLockManager()->isDisabled('customer_create_form_submit')): ?>
+                <?php if ($buttonLockManager && $buttonLockManager->isDisabled('customer_create_form_submit')): ?>
                     disabled="disabled"
                 <?php endif; ?>>
                 <span><?= $escaper->escapeHtml(__('Create an Account')) ?></span>
@@ -314,20 +311,14 @@ $formData = $block->getFormData();
         </div>
     </div>
 </form>
-<?php $ignore = /* @noEscape */ $_dob->isEnabled() ? '\'input[id$="full"]\'' : 'null';
-$scriptString = <<<script
+<?php if ($_dob->isEnabled()): ?>
+<script>
 require([
     'jquery',
     'mage/mage'
 ], function($){
-
     var dataForm = $('#form-validate');
-    var ignore = {$ignore};
-
     dataForm.mage('validation', {
-script;
-if ($_dob->isEnabled()):
-    $scriptString .= <<<script
         errorPlacement: function(error, element) {
             if (element.prop('id').search('full') !== -1) {
                 var dobElement = $(element).parents('.customer-dob'),
@@ -340,19 +331,11 @@ if ($_dob->isEnabled()):
                 error.insertAfter(element);
             }
         },
-        ignore: ':hidden:not(' + ignore + ')'
-script;
-else:
-    $scriptString .= <<<script
-        ignore: ignore ? ':hidden:not(' + ignore + ')' : ':hidden'
-script;
-endif;
-$scriptString .= <<<script
+        ignore: ':hidden:not(input[id$="full"])'
     }).find('input:text').attr('autocomplete', 'off');
 });
-script;
-?>
-<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
+</script>
+<?php endif; ?>
 <?php if ($block->getShowAddressFields()): ?>
     <?php
     $regionJson = /* @noEscape */ $regionProvider->getRegionJson();