[Pkg-owncloud-commits] [owncloud] 08/50: excerpt code changes from 79ba930ef90d3e54c02f62c43f61c190e11fb4ec

[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 6da05d0ca45ccbc600790bafd13d70a2ff541f8f
Author: Georg Ehrke <developer at georgehrke.com>
Date:   Tue Aug 26 19:39:30 2014 +0200

    excerpt code changes from 79ba930ef90d3e54c02f62c43f61c190e11fb4ec
---
 lib/private/image.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/private/image.php b/lib/private/image.php
index 8899c65..17648ba 100644
--- a/lib/private/image.php
+++ b/lib/private/image.php
@@ -202,7 +202,7 @@ class OC_Image {
 			return false;
 		}
 
-		$imageType = null;
+		$imageType = $this->imageType;
 		if($mimeType !== null) {
 			switch($mimeType) {
 				case 'image/gif':
@@ -222,10 +222,7 @@ class OC_Image {
 					break;
 				default:
 					throw new Exception('\OC_Image::_output(): "' . $mimeType . '" is not supported when forcing a specific output format');
-					break;
 			}
-		} else {
-			$imageType = $this->imageType;
 		}
 
 		switch($imageType) {

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