summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/class/image.php22
-rw-r--r--app/class/obj.class.php1
2 files changed, 13 insertions, 10 deletions
diff --git a/app/class/image.php b/app/class/image.php
index 591e026..62999aa 100644
--- a/app/class/image.php
+++ b/app/class/image.php
@@ -20,17 +20,19 @@
/*
* Mappings from image MIME types to PHP open/write functions
*/
-$_IMG_OPEN_FUNCS['image/jpeg'] = "imagecreatefromjpeg";
-$_IMG_OPEN_FUNCS['image/jpg'] = "imagecreatefromjpeg";
-$_IMG_OPEN_FUNCS['image/png'] = "imagecreatefrompng";
-$_IMG_OPEN_FUNCS['image/gif'] = "imagecreatefromgif";
-$_IMG_OPEN_FUNCS['image/bmp'] = "imagecreatefrombmp";
+$_IMG_OPEN_FUNCS['image/jpeg'] = "imagecreatefromjpeg";
+$_IMG_OPEN_FUNCS['image/jpg'] = "imagecreatefromjpeg";
+$_IMG_OPEN_FUNCS['image/png'] = "imagecreatefrompng";
+$_IMG_OPEN_FUNCS['image/gif'] = "imagecreatefromgif";
+$_IMG_OPEN_FUNCS['image/bmp'] = "imagecreatefrombmp";
+$_IMG_OPEN_FUNCS['image/x-ms-bmp'] = "imagecreatefrombmp";
-$_IMG_WRITE_FUNCS['image/jpeg'] = "imagejpeg";
-$_IMG_WRITE_FUNCS['image/jpg'] = "imagejpeg";
-$_IMG_WRITE_FUNCS['image/png'] = "imagepng";
-$_IMG_WRITE_FUNCS['image/gif'] = "imagegif";
-$_IMG_WRITE_FUNCS['image/bmp'] = "imagebmp";
+$_IMG_WRITE_FUNCS['image/jpeg'] = "imagejpeg";
+$_IMG_WRITE_FUNCS['image/jpg'] = "imagejpeg";
+$_IMG_WRITE_FUNCS['image/png'] = "imagepng";
+$_IMG_WRITE_FUNCS['image/gif'] = "imagegif";
+$_IMG_WRITE_FUNCS['image/bmp'] = "imagebmp";
+$_IMG_WRITE_FUNCS['image/x-ms-bmp'] = "imagebmp";
/*
* Open the given image and crop it, such that the result is a square
diff --git a/app/class/obj.class.php b/app/class/obj.class.php
index 81a0a27..353d617 100644
--- a/app/class/obj.class.php
+++ b/app/class/obj.class.php
@@ -32,6 +32,7 @@ class obj extends table
"image/png",
"image/gif",
"image/bmp",
+ "image/x-ms-bmp",
);
/*