projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
support force mimetype in URL
[Pman.Core]
/
DataObjects
/
Images.php
diff --git
a/DataObjects/Images.php
b/DataObjects/Images.php
index
ab54401
..
0f30c83
100644
(file)
--- 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';
{
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;
$fc = $this->toFileConvert();
// print_r($size);
// exit;
- $mt = $t
his->mime
type;
+ $mt = $t
o_type == false ? $this->mimetype : $to_
type;
if (!preg_match('#^image/#i',$mt)) {
$mt = 'image/jpeg';
}
if (!preg_match('#^image/#i',$mt)) {
$mt = 'image/jpeg';
}