DataObjects/Core_notify_recur.php

[Pman.Core] / DataObjects / Images.php

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 9b98c0c..d1c6faa 100644 (file)
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -107,7 +107,6 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
      */
     function createFrom($file, $filename=false)
     {
-        print_r('run');exit;
         // copy the file into the storage area..
         if (!file_exists($file) || !filesize($file)) {
             return false;
@@ -364,6 +363,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         if (!empty($mime_like)) {
             $c->whereAdd("Images.mimetype LIKE '". $c->escape($mime_like) ."'");
         }
+        $c->orderBy('created DESC');
 
         return $c->fetchAll();
     }
@@ -460,8 +460,12 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         $fc = $this->toFileConvert();
 //        print_r($size);
 //        exit;
-        $fc->convert($this->mimetype, $size);
+        $mt = $this->mimetype;
+        if (!preg_match('#^image/#i',$mt)) {
+            $mt = 'image/jpeg';
+        }
         
+        $fc->convert($mt, $size);
         
         return $baseURL . $provider . "/$size/{$this->id}/{$this->filename}";
     }