Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGeorg Ehrke <developer@georgehrke.com>2014-03-14 14:17:20 +0400
committerGeorg Ehrke <developer@georgehrke.com>2014-03-14 14:17:20 +0400
commitc140010e813480c5d67ec7b7751b0b36a8a3af65 (patch)
tree714a98f3fea5afbdf9339f9c63b14ac7996c382e /lib
parent0c3c75efd5fd2e68d67ac45a63e6226d1b8e822b (diff)
don't change mimetype of whole image object
Diffstat (limited to 'lib')
-rw-r--r--lib/private/image.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/private/image.php b/lib/private/image.php
index df49bf9848d..d108360b2a8 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 {