diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php index b8fe7df8189de416ae51edffb5ea914c4f035974..fa29d46c615939533111d3f62c540f848f06710b 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php @@ -81,6 +81,30 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Category ?: \Magento\Framework\App\ObjectManager::getInstance()->get(\Magento\Eav\Model\Config::class); } + /** + * Filter category data + * + * @deprecated + * @param array $rawData + * @return array + */ + protected function _filterCategoryPostData(array $rawData) + { + $data = $rawData; + if (isset($data['image']) && is_array($data['image'])) { + if (!empty($data['image']['delete'])) { + $data['image'] = null; + } else { + if (isset($data['image'][0]['name']) && isset($data['image'][0]['tmp_name'])) { + $data['image'] = $data['image'][0]['name']; + } else { + unset($data['image']); + } + } + } + return $data; + } + /** * Category save * @@ -239,7 +263,7 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Category * @param array $data * @return array */ - public function imagePreprocessing(array $data) + public function imagePreprocessing($data) { $entityType = $this->eavConfig->getEntityType(CategoryAttributeInterface::ENTITY_TYPE_CODE); diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php index a3e90819912f03a9413311600c7cd5cbcfddff60..49787c94038a1d9b1c3991c7f6261c0b7ef1453e 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php @@ -293,7 +293,7 @@ class CategoryTest extends \PHPUnit_Framework_TestCase ->isObjectNew(true); $repository->save($model); - $this->assertNull($model->getImage()); + $this->assertEmpty($model->getImage()); } /**