projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
46e40ca
)
DataObjects/Images.php
author
Alan Knowles
<alan@roojs.com>
Fri, 9 Jan 2015 04:36:01 +0000
(12:36 +0800)
committer
Alan Knowles
<alan@roojs.com>
Fri, 9 Jan 2015 04:36:01 +0000
(12:36 +0800)
DataObjects/Images.php
patch
|
blob
|
history
diff --git
a/DataObjects/Images.php
b/DataObjects/Images.php
index
ecbb381
..
5b6672a
100644
(file)
--- 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 = $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}";
}
return $baseURL . $provider . "/$size/{$this->id}/{$this->filename}";
}