MAGETWO-55814: East team bugfixing

vzabaznov · vzabaznov · commit 34cc230400fe · 2016-07-26T16:30:41.000+03:00
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
@@ -154,7 +154,7 @@ private function setMessageToResponse($response, $messages)
      */
     private function checkUniqueOption(DataObject $response, array $options = null)
     {
-        if (is_array($options) and !$this->isUniqueAdminValues($options['value'], $options['delete'])) {
+        if (is_array($options) && !$this->isUniqueAdminValues($options['value'], $options['delete'])) {
             $this->setMessageToResponse($response, [__("The value of Admin must be unique.")]);
             $response->setError(true);
         }

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ private function setMessageToResponse($response, $messages)`
`154`	`154`	`*/`
`155`	`155`	`private function checkUniqueOption(DataObject $response, array $options = null)`
`156`	`156`	`{`
`157`		`- if (is_array($options) and !$this->isUniqueAdminValues($options['value'], $options['delete'])) {`
	`157`	`+ if (is_array($options) && !$this->isUniqueAdminValues($options['value'], $options['delete'])) {`
`158`	`158`	`$this->setMessageToResponse($response, [__("The value of Admin must be unique.")]);`
`159`	`159`	`$response->setError(true);`
`160`	`160`	`}`