🔃 [EngCom] Public Pull Requests - 2.1-develop

Accepted Public Pull Requests:
 - magento/magento2#17855: [Backport] Fixes black background for png images in wysiwyg editors. (by @eduard13)
 - magento/magento2#17774: Fix for ProductLink - setterName was incorrectly being set (by @insanityinside)


Fixed GitHub Issues:
 - magento/magento2#14248: Transparent background becomes black for thumbnails of PNG into Wysiwyg editor... (reported by @jb-dg) has been fixed in magento/magento2#17855 by @eduard13 in 2.1-develop branch
   Related commits:
     1. 99eb521

Author: Stanislav Idolov

app/code/Magento/Catalog/Model/ProductLink/Repository.php

@@ -178,7 +178,7 @@ public function getList(\Magento\Catalog\Api\Data\ProductInterface $product)
                     foreach ($item['custom_attributes'] as $option) {
                         $name = $option['attribute_code'];
                         $value = $option['value'];
-                        $setterName = 'set'.ucfirst($name);
+                        $setterName = 'set'.str_replace('_', '', ucwords($name, '_'));
                         // Check if setter exists
                         if (method_exists($productLinkExtension, $setterName)) {
                             call_user_func([$productLinkExtension, $setterName], $value);

lib/internal/Magento/Framework/Image/Adapter/Gd2.php

@@ -63,6 +63,16 @@ public function open($filename)
         }
         $this->imageDestroy();
         $this->_imageHandler = call_user_func($this->_getCallback('create'), $this->_fileName);
+        $fileType = $this->getImageType();
+        if (in_array($fileType, [IMAGETYPE_PNG, IMAGETYPE_GIF])) {
+            $this->_keepTransparency = true;
+            if ($this->_imageHandler) {
+                $isAlpha = $this->checkAlpha($this->_fileName);
+                if ($isAlpha) {
+                    $this->_fillBackgroundColor($this->_imageHandler);
+                }
+            }
+        }
     }
 
     /**