X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FImages.php;fp=DataObjects%2FImages.php;h=907b890dacd81661757e6f14b5300377f16f0535;hp=537a68f114dff14b7d10a93476a9701314d46fbb;hb=c59690f8a6802c8c95086a25b354479e87e1e8f3;hpb=4ca8d7a85962d1146c5f783801aa1ed72cba65ab

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 537a68f1..907b890d 100644
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -200,10 +200,13 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
      *
      * @return - target file name
      */
-    function getStoreName() 
+    function getStoreName($alt = false) 
     {
         $opts = HTML_FlexyFramework::get()->Pman;
         $fn = preg_replace('/[^a-z0-9_\.]+/i', '_', $this->filename);
+        if ($alt) {
+            $fn = preg_replace('/[^a-z0-9\.]+/i', '_', $this->filename);
+        }
         return implode( '/', array(
             $opts['storedir'], '_images_', date('Y/m', strtotime($this->created)), $this->id . '-'. $fn
         ));
@@ -668,6 +671,11 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
      */
     function toFileConvert()
     {
+        $fn = $this->getStoreName();
+        if (!file_exists($fn)) {
+            $fn = $this->getStoreName(true);
+        }
+        
         require_once 'File/Convert.php';
         $fc = new File_Convert($this->getStoreName(), $this->mimetype);
         return $fc;