MAGETWO-71200: Optimize validation #10381

magento · Jul 31, 2017 · 22d2489 · 22d2489
2 parents eb31731 + f17be38
commit 22d2489
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/app/code/Magento/Customer/Model/Address/AbstractAddress.php b/app/code/Magento/Customer/Model/Address/AbstractAddress.php
@@ -566,6 +566,10 @@ public function getDataModel($defaultBillingAddressId = null, $defaultShippingAd
      */
     public function validate()
     {
+        if ($this->getShouldIgnoreValidation()) {
+            return true;
+        }
+
         $errors = [];
         if (!\Zend_Validate::is($this->getFirstname(), 'NotEmpty')) {
             $errors[] = __('%fieldName is a required field.', ['fieldName' => 'firstname']);
@@ -627,7 +631,7 @@ public function validate()
             $errors[] = __('%fieldName is a required field.', ['fieldName' => 'regionId']);
         }
 
-        if (empty($errors) || $this->getShouldIgnoreValidation()) {
+        if (empty($errors)) {
             return true;
         }
         return $errors;