Merge pull request #36 from Mknsri/master

Fixed image-variable name conflict
samayo · Aug 4, 2015 · 533c16a · 533c16a
2 parents dc541c9 + 14bce94
commit 533c16a
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/utils/func.image-resize.php b/src/utils/func.image-resize.php
@@ -39,11 +39,11 @@ function resize($image, $mimeType, $imgWidth, $imgHeight, $newWidth, $newHeight,
 
     $imgString = file_get_contents($image);
 
-    $image = imagecreatefromstring($imgString);
+    $imageFromString = imagecreatefromstring($imgString);
     $tmp = imagecreatetruecolor($newWidth, $newHeight);
     imagecopyresampled(
         $tmp,
-        $image,
+        $imageFromString,
         0,
         0,
         0,
@@ -73,4 +73,3 @@ function resize($image, $mimeType, $imgWidth, $imgHeight, $newWidth, $newHeight,
 }
 
 
-