From 8154dafab04e7fd8642107f40c70034a6527b7e4 Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Fri, 9 Jan 2015 12:36:01 +0800
Subject: [PATCH] DataObjects/Images.php

---
 DataObjects/Images.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index ecbb3819..5b6672a2 100644
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -460,8 +460,12 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         $fc = $this->toFileConvert();
 //        print_r($size);
 //        exit;
-        $fc->convert($this->mimetype, $size);
+        $mt = $this->mimetype;
+        if (!preg_match('#^image/#i')) {
+            $mt = 'image/jpeg';
+        }
         
+        $fc->convert($mt, $size);
         
         return $baseURL . $provider . "/$size/{$this->id}/{$this->filename}";
     }
-- 
2.39.2