projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix shorten name for jpeg
[Pman.Core]
/
DataObjects
/
Images.php
diff --git
a/DataObjects/Images.php
b/DataObjects/Images.php
index
0f30c83
..
8c6cabf
100644
(file)
--- a/
DataObjects/Images.php
+++ b/
DataObjects/Images.php
@@
-593,12
+593,13
@@
class Pman_Core_DataObjects_Images extends DB_DataObject
$fc = $this->toFileConvert();
// print_r($size);
// exit;
$fc = $this->toFileConvert();
// print_r($size);
// exit;
- $mt = $to_type == false ? $this->mimetype : $to_type;
+ $mt = $to_type ==
=
false ? $this->mimetype : $to_type;
if (!preg_match('#^image/#i',$mt)) {
$mt = 'image/jpeg';
}
if (!preg_match('#^image/#i',$mt)) {
$mt = 'image/jpeg';
}
- $fc->convert($mt, $size);
+ $cn = $fc->convert($mt, $size);
+ $shorten_name = $this->shorten_name(basename($cn));
return $baseURL . $provider . "/$size/{$this->id}/{$shorten_name}"; // -- this breaks the rss feed #image-{$this->id}";
}
return $baseURL . $provider . "/$size/{$this->id}/{$shorten_name}"; // -- this breaks the rss feed #image-{$this->id}";
}
@@
-631,13
+632,14
@@
class Pman_Core_DataObjects_Images extends DB_DataObject
}
}
- function shorten_name()
+ function shorten_name(
$fn = false
)
{
if(empty($this->filename)) {
return;
}
{
if(empty($this->filename)) {
return;
}
+ $fn = $fn === false ? $this->filename : $fn;
- $filename = explode('.', $
this->filename
);
+ $filename = explode('.', $
fn
);
$ext = array_pop($filename);
$name = preg_replace("/[^A-Z0-9.]+/i", '-', implode('-', $filename)) ;
$ext = array_pop($filename);
$name = preg_replace("/[^A-Z0-9.]+/i", '-', implode('-', $filename)) ;