MAGETWO-93982: Category image on custom Store View level disappears and appears after every save

Oleksandr Dubovyk · Oleksandr Dubovyk · commit 3152b804d1f4 · 2018-08-01T18:55:52.000+03:00
diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php
@@ -106,7 +106,7 @@ public function beforeSave($object)
             $object->setData($this->additionalData . $attributeName, $value);
             $object->setData($attributeName, $imageName);
         } elseif (!is_string($value)) {
-            $object->setData($attributeName, '');
+            $object->setData($attributeName, null);
         }
 
         return parent::beforeSave($object);
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Backend/ImageTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Backend/ImageTest.php
@@ -98,7 +98,7 @@ public function testBeforeSaveValueDeletion($value)
 
         $model->beforeSave($object);
 
-        $this->assertEquals('', $object->getTestAttribute());
+        $this->assertEquals(null, $object->getTestAttribute());
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public function beforeSave($object)`
`106`	`106`	`$object->setData($this->additionalData . $attributeName, $value);`
`107`	`107`	`$object->setData($attributeName, $imageName);`
`108`	`108`	`} elseif (!is_string($value)) {`
`109`		`- $object->setData($attributeName, '');`
	`109`	`+ $object->setData($attributeName, null);`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`return parent::beforeSave($object);`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public function testBeforeSaveValueDeletion($value)`
`98`	`98`
`99`	`99`	`$model->beforeSave($object);`
`100`	`100`
`101`		`- $this->assertEquals('', $object->getTestAttribute());`
	`101`	`+ $this->assertEquals(null, $object->getTestAttribute());`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`/**`