X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FImages.php;fp=DataObjects%2FImages.php;h=8c6cabf56f605274aecc519cfeb219c1de3844f6;hp=0f30c83be3a5284ad40636f53aa1e936961b80ef;hb=8539d2d04d40e7b5c6ed629fcaf111662da1c3fe;hpb=d81e1cda8b71e00e702d036fe3396509370c6c45

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 0f30c83b..8c6cabf5 100644
--- 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;
-        $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';
         }
         
-        $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}";
     }
@@ -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;
         }
+        $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)) ;