From 77d532ea15b284f9c954a8c0d46125f4d5edc2e2 Mon Sep 17 00:00:00 2001
From: Oliver Vogel <oliver@olivervogel.net>
Date: Thu, 16 Jan 2014 14:54:04 +0100
Subject: [PATCH] bugfix

---
 src/Intervention/Image/Image.php | 7 ++++++-
 tests/ImageTest.php              | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Intervention/Image/Image.php b/src/Intervention/Image/Image.php
index acda62ed..ddf643fd 100644
--- a/src/Intervention/Image/Image.php
+++ b/src/Intervention/Image/Image.php
@@ -1408,7 +1408,7 @@ class Image
      */
     public function encode($format = null, $quality = 90)
     {
-        $format = is_null($format) ? $this->type : $format;
+        $format = is_null($format) ? $this->mime : $format;
 
         if ($quality < 0 || $quality > 100) {
             throw new Exception\ImageQualityException('Quality of image must range from 0 to 100.');
@@ -1422,6 +1422,7 @@ class Image
                 break;
 
             case 'gif':
+            case 'image/gif':
             case IMAGETYPE_GIF:
                 imagegif($this->resource);
                 $this->type = IMAGETYPE_GIF;
@@ -1429,6 +1430,7 @@ class Image
                 break;
 
             case 'png':
+            case 'image/png':
             case IMAGETYPE_PNG:
                 $quality = round($quality / 11.11111111111); // transform quality to png setting
                 imagealphablending($this->resource, false);
@@ -1441,6 +1443,8 @@ class Image
             default:
             case 'jpg':
             case 'jpeg':
+            case 'image/jpg':
+            case 'image/jpeg':
             case IMAGETYPE_JPEG:
                 imagejpeg($this->resource, null, $quality);
                 $this->type = IMAGETYPE_JPEG;
@@ -1824,6 +1828,7 @@ class Image
         }
 
         $this->resource = $resource;
+        $this->mime = finfo_buffer(finfo_open(FILEINFO_MIME_TYPE), $string);
         $this->width = imagesx($this->resource);
         $this->height = imagesy($this->resource);
         $this->original['width'] = $this->width;
diff --git a/tests/ImageTest.php b/tests/ImageTest.php
index daa600e5..7e60d538 100644
--- a/tests/ImageTest.php
+++ b/tests/ImageTest.php
@@ -161,6 +161,7 @@ class ImageTest extends PHPUnit_Framework_Testcase
         $this->assertInternalType('int', $img->height);
         $this->assertEquals($img->width, 800);
         $this->assertEquals($img->height, 600);
+        $this->assertEquals($img->mime, 'image/jpeg');
     }
 
     public function testStaticCallMakeFromResource()