MAGETWO-52737: Deleting category's image on custom store view - deletes category's images for all store views

Author: slopukhov

app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php

@@ -82,7 +82,7 @@ protected function _filterCategoryPostData(array $rawData)
         $data = $rawData;
         // @todo It is a workaround to prevent saving this data in category model and it has to be refactored in future
         if (isset($data['image']) && is_array($data['image'])) {
-            if (is_array($data['image']) && !empty($data['image']['delete'])) {
+            if (!empty($data['image']['delete'])) {
                 $data['image'] = null;
             } else {
                 if (isset($data['image'][0]['name']) && isset($data['image'][0]['tmp_name'])) {

app/code/Magento/Catalog/Model/CategoryRepository.php

@@ -91,7 +91,7 @@ public function save(\Magento\Catalog\Api\Data\CategoryInterface $category)
             );
 
             if (isset($existingData['image']) && is_array($existingData['image'])) {
-                if (is_array($existingData['image']) && !empty($existingData['image']['delete'])) {
+                if (!empty($existingData['image']['delete'])) {
                     $existingData['image'] = null;
                 } else {
                     if (isset($existingData['image'][0]['name']) && isset($existingData['image'][0]['tmp_name'])) {