From: Alan Knowles <alan@akbkhome.com>
Date: Fri, 15 Apr 2011 04:58:41 +0000 (+0800)
Subject: Merge branch 'master' of http://private.akbkhome.com/Pman.Core
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=b8a1dc3b478d39bcaeb16337125dac7e0195740f

Merge branch 'master' of private.akbkhome.com/Pman.Core
---

b8a1dc3b478d39bcaeb16337125dac7e0195740f
diff --cc DataObjects/Images.php
index 1c790e0d,37e0579f..dfc22bb4
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@@ -249,8 -271,9 +271,9 @@@ class Pman_Core_DataObjects_Images exte
          $c = clone($this);
          $c->ontable = $obj->tableName();
          $c->onid = $obj->id;
+         $c->autoJoin();
          if (!empty($mime_like)) {
 -            $c->whereAdd("mimetype LIKE '". $c->escape($mime_like) ."'");
 +            $c->whereAdd("Images.mimetype LIKE '". $c->escape($mime_like) ."'");
          }
  
          return $c->fetchAll();