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

Oleksandr Dubovyk · Oleksandr Dubovyk · commit 952b09871ae4 · 2018-06-27T17:02:31.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
@@ -99,7 +99,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
@@ -88,7 +88,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
`@@ -99,7 +99,7 @@ public function beforeSave($object)`
`99`	`99`	`$object->setData($this->additionalData . $attributeName, $value);`
`100`	`100`	`$object->setData($attributeName, $imageName);`
`101`	`101`	`} elseif (!is_string($value)) {`
`102`		`- $object->setData($attributeName, '');`
	`102`	`+ $object->setData($attributeName, null);`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`return parent::beforeSave($object);`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public function testBeforeSaveValueDeletion($value)`
`88`	`88`
`89`	`89`	`$model->beforeSave($object);`
`90`	`90`
`91`		`- $this->assertEquals('', $object->getTestAttribute());`
	`91`	`+ $this->assertEquals(null, $object->getTestAttribute());`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`/**`