diff options
| author | Georg Ehrke <developer@georgehrke.com> | 2014-08-26 21:39:30 +0400 |
|---|---|---|
| committer | Georg Ehrke <developer@georgehrke.com> | 2014-08-26 21:39:30 +0400 |
| commit | 6da05d0ca45ccbc600790bafd13d70a2ff541f8f (patch) | |
| tree | ba9f4b1b7b7d4ab32f4bfbdad26f889ff70f68f3 /lib | |
| parent | c82f158c16ee23b543557caf7377c98c992fd4e0 (diff) | |
excerpt code changes from 79ba930ef90d3e54c02f62c43f61c190e11fb4ec
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/image.php | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/private/image.php b/lib/private/image.php index 8899c654478..17648ba6894 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) { |