From c140010e813480c5d67ec7b7751b0b36a8a3af65 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <developer@georgehrke.com>
Date: Fri, 14 Mar 2014 11:17:20 +0100
Subject: [PATCH] don't change mimetype of whole image object
---
lib/private/image.php | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/private/image.php b/lib/private/image.php
index df49bf9848..d108360b2a 100644
--- a/lib/private/image.php
+++ b/lib/private/image.php
@@ -202,23 +202,23 @@ class OC_Image {
if($mimeType !== null) {
switch($mimeType) {
case 'image/gif':
- $this->imageType = IMAGETYPE_GIF;
+ $imageType = IMAGETYPE_GIF;
break;
case 'image/jpeg':
case 'image/pjpeg':
- $this->imageType = IMAGETYPE_JPEG;
+ $imageType = IMAGETYPE_JPEG;
break;
case 'image/png':
- $this->imageType = IMAGETYPE_PNG;
+ $imageType = IMAGETYPE_PNG;
break;
case 'image/x-xbitmap':
- $this->imageType = IMAGETYPE_XBM;
+ $imageType = IMAGETYPE_XBM;
break;
case 'image/bmp':
- $this->imageType = IMAGETYPE_BMP;
+ $imageType = IMAGETYPE_BMP;
break;
default:
- $this->imageType = IMAGETYPE_PNG;
+ $imageType = IMAGETYPE_PNG;
break;
}
} else {
--
GitLab