DataObjects/Images.php

[Pman.Core] / DataObjects / Images.php

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 2cf3492..1250f51 100644 (file)
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -32,10 +32,10 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
     function applyFilters($q, $au, $roo)
     {
         $tn = $this->tableName();
-        echo "$tn.filename LIKE '%{$this->escape($q['search']['filename'])}%'"; die;
+        
         if(!empty($q['search']['filename'])){
             $this->whereAdd("
-                $tn.filename LIKE '%{$this->escape($q['search']['filename'])}%'
+                $tn.filename LIKE '%{$this->escape($q['search']['filename'])}%' OR $tn.title LIKE '%{$this->escape($q['search']['filename'])}%'
             ");
         }
         
@@ -755,7 +755,8 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         
         $ext = $y->toExt(trim((string) $this->mimetype ));
         
-        if(array_pop(explode('.', $this->filename)) != $ext){
+        $explode_filename = explode('.', $this->filename);
+        if(array_pop($explode_filename) != $ext){
             $this->filename = $this->filename .'.'. $ext; 
         }
         
@@ -772,7 +773,9 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         
         $this->mimetype= strtolower($this->mimetype);
         
-        if (array_shift(explode('/', $this->mimetype)) == 'image') { 
+        $explode_mimetype = explode('/', $this->mimetype);
+        
+        if (array_shift($explode_mimetype) == 'image') { 
         
             $imgs = @getimagesize($data);