MAGETWO-71255: Merge 2.2 into develop mainline (2.3)

cpartica · cpartica · commit 5688d6adc753 · 2017-08-03T14:03:00.000-05:00
- stabilize builds
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
@@ -169,8 +169,8 @@ private function checkUniqueOption(DataObject $response, array $options = null)
                     $response,
                     [__('The value of Admin must be unique. (%1)', implode(', ', $duplicates))]
                 );
+                $response->setError(true);
             }
-            $response->setError(true);
         }
         return $this;
     }

Original file line number	Diff line number	Diff line change
`@@ -169,8 +169,8 @@ private function checkUniqueOption(DataObject $response, array $options = null)`
`169`	`169`	`$response,`
`170`	`170`	`[__('The value of Admin must be unique. (%1)', implode(', ', $duplicates))]`
`171`	`171`	`);`
	`172`	`+ $response->setError(true);`
`172`	`173`	`}`
`173`		`- $response->setError(true);`
`174`	`174`	`}`
`175`	`175`	`return $this;`
`176`	`176`	`}`