DataObjects/Images.php

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index b06c65a..3f71ed6 100644 (file)
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -658,6 +658,21 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             return false;
         }
         
+        if (!empty($this->imgtype) && $this->imgtype[0] == '-' && !empty($this->onid)) {
+            // then its an upload 
+            $img  = DB_DataObject::factory('Images');
+            $img->onid = $this->onid;
+            $img->ontable = $this->ontable;
+            $img->imgtype = $this->imgtype;
+            
+            $img->find();
+            while ($img->fetch()) {
+                $img->beforeDelete();
+                $img->delete();
+            }
+            
+        }
+        
         require_once 'File/MimeType.php';
         $y = new File_MimeType();
         
@@ -676,7 +691,9 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         
         $ext = $y->toExt(trim((string) $this->mimetype ));
         
-        $this->filename = $this->filename .'.'. $ext; 
+        if(array_pop(explode('.', $this->filename)) != $ext){
+            $this->filename = $this->filename .'.'. $ext; 
+        }
         
         if (!$this->createFromData($data)) {
             return false;