[Pkg-owncloud-commits] [owncloud] 05/50: don't change mimetype of whole image object

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v6.0.6RC1
in repository owncloud.

commit ee8ded88b32d51c8f1507a57e66f52eaedc7cc11
Author: Georg Ehrke <developer at georgehrke.com>
Date:   Fri Mar 14 11:17:20 2014 +0100

    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 b704e28..5323699 100644
--- a/lib/private/image.php
+++ b/lib/private/image.php
@@ -206,23 +206,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 {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git