summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-02-14 11:38:40 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-02-14 11:38:40 +0100
commitac367b97f0567481d3496a213c04eeb5cf654a9f (patch)
treea2527bea1f8be9efa44fa6ebe31d17b2318f8640
parent7061416016de23634b4915239a70cec8e1dd4eb3 (diff)
parente60e0fe22cf68548a5704889bf7a980f7bf38bbf (diff)
downloadnextcloud-server-ac367b97f0567481d3496a213c04eeb5cf654a9f.tar.gz
nextcloud-server-ac367b97f0567481d3496a213c04eeb5cf654a9f.zip
Merge pull request #22369 from owncloud/fix-bmp-support
Fix BMP support
-rw-r--r--lib/private/image.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/private/image.php b/lib/private/image.php
index dc01f989d79..0f74bd1c565 100644
--- a/lib/private/image.php
+++ b/lib/private/image.php
@@ -257,6 +257,7 @@ class OC_Image implements \OCP\IImage {
$imageType = IMAGETYPE_XBM;
break;
case 'image/bmp':
+ case 'image/x-ms-bmp':
$imageType = IMAGETYPE_BMP;
break;
default: