Merge branch 'master' into feature/url-routing

Geeklog-Core · Apr 3, 2016 · 034d0bb · 034d0bb
2 parents 09ca74e + 1a82c11
commit 034d0bb
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/system/classes/upload.class.php b/system/classes/upload.class.php
@@ -701,6 +701,12 @@ function _copyFile()
                     unlink ($filename);
                 }
 
+                // Prevent transparent area of a JPEG image from being painted black
+                if (is_callable('imagealphablending') && is_callable('imagesavealpha')) {
+                    imagealphablending($image_dest, false);
+                    imagesavealpha($image_dest, true);
+                }
+
                 imagecopyresampled($image_dest, $image_source, 0, 0, 0, 0,
                                    $newwidth, $newheight, $imageInfo['width'],
                                    $imageInfo['height']);
@@ -1343,5 +1349,3 @@ function uploadFiles()
         }
     }
 }
-
-?>