dont use ignore variable, use getIsUserDefined instead

OpenMage · Aug 2, 2022 · 1956c43 · 1956c43
1 parent 6e379ce
commit 1956c43
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Billing.php b/app/code/core/Mage/Checkout/Block/Onepage/Billing.php
@@ -231,11 +231,10 @@ public function extraFields()
         $form->setFormCode('checkout_register');
 
         $attributes = $form->getAttributes();
-
-        $ignore = ['prefix', 'firstname', 'middlename', 'lastname', 'suffix', 'email', 'dob', 'taxvat', 'created_at', 'gender'];
-
-        foreach ($ignore as $code) {
-            unset($attributes[$code]);
+        foreach ($attributes as $code => $attribute) {
+            if (!$attribute->getIsUserDefined()) {
+                unset($attributes[$code]);
+            }
         }
 
         return $attributes;

diff --git a/app/code/core/Mage/Customer/Block/Form/Edit.php b/app/code/core/Mage/Customer/Block/Form/Edit.php
@@ -50,11 +50,10 @@ public function extraFields()
              ->initDefaultValues();
 
         $attributes = $form->getAttributes();
-
-        $ignore = ['prefix', 'firstname', 'middlename', 'lastname', 'suffix', 'email', 'dob', 'taxvat', 'created_at', 'gender'];
-
-        foreach ($ignore as $code) {
-            unset($attributes[$code]);
+        foreach ($attributes as $code => $attribute) {
+            if (!$attribute->getIsUserDefined()) {
+                unset($attributes[$code]);
+            }
         }
 
         return $attributes;

diff --git a/app/code/core/Mage/Customer/Block/Form/Register.php b/app/code/core/Mage/Customer/Block/Form/Register.php
@@ -193,11 +193,10 @@ public function extraFields()
         $form->setFormCode('customer_account_create');
 
         $attributes = $form->getAttributes();
-
-        $ignore = ['prefix', 'firstname', 'middlename', 'lastname', 'suffix', 'email', 'dob', 'taxvat', 'created_at', 'gender'];
-
-        foreach ($ignore as $code) {
-            unset($attributes[$code]);
+        foreach ($attributes as $code => $attribute) {
+            if (!$attribute->getIsUserDefined()) {
+                unset($attributes[$code]);
+            }
         }
 
         return $attributes;