DataObjects/Events.php

[Pman.Core] / DataObjects / Events.php

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index 60f1828..9585f5b 100644 (file)
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -49,7 +49,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
                 
                 $keys = $jt->keys();
             
-                $this->_join = "LEFT JOIN {$jt->tableName()} AS join_person_id_id ON (join_person_id_id.{$keys[0]}=Events.person_id)";
+                $this->_join = "LEFT JOIN {$jt->tableName()} AS join_person_id_id ON (join_person_id_id.{$keys[0]}={$tn}.person_id)";
                 //$this->_join = "LEFT JOIN {$jt->tableName()} AS join_person_id_id ON (join_person_id_id.{$keys[0]}=Events.person_id)";
                 $this->selectAdd();
                 $this->selectAs();
@@ -120,7 +120,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         
         if (isset($q['on_table']) && !strlen($q['on_table'])) {
             // empty ontable queries.. these are valid..
-            $this->whereAdd("$tn.on_table = ''");
+            $this->whereAdd("{$tn}.on_table = ''");
         }
       
         if (isset($q['query']['person_sum'])) {
@@ -250,12 +250,12 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         
         if(!empty($q['query']['action'])) {
             $act = $this->escape($q['query']['action']);
-            $this->whereAdd("Events.action LIKE '%{$act}%'");
+            $this->whereAdd("{$tn}.action LIKE '%{$act}%'");
         }
         
         if(!empty($q['query']['on_table'])) {
             $tnb = $this->escape($q['query']['on_table']);
-            $this->whereAdd("Events.on_table LIKE '%{$tnb}%'");
+            $this->whereAdd("{$tn}.on_table LIKE '%{$tnb}%'");
         } 
         
     }