X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FImages.php;fp=DataObjects%2FImages.php;h=0f30c83be3a5284ad40636f53aa1e936961b80ef;hp=ab54401f8e26bb3f4dca39d85e83c2b98a8fe281;hb=d81e1cda8b71e00e702d036fe3396509370c6c45;hpb=0dd781fab6843f8f9b45de566269ceb381bbe0f5 diff --git a/DataObjects/Images.php b/DataObjects/Images.php index ab54401f..0f30c83b 100644 --- a/DataObjects/Images.php +++ b/DataObjects/Images.php @@ -557,7 +557,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject * * */ - function URL($size , $provider = '/Images/Thumb', $baseURL=false) + function URL($size , $provider = '/Images/Thumb', $baseURL=false, $to_type=false) { if (!$this->id) { return 'about:blank'; @@ -593,7 +593,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject $fc = $this->toFileConvert(); // print_r($size); // exit; - $mt = $this->mimetype; + $mt = $to_type == false ? $this->mimetype : $to_type; if (!preg_match('#^image/#i',$mt)) { $mt = 'image/jpeg'; }