DataObjects/Core_watch.php

[Pman.Core] / DataObjects / Person.php

diff --git a/DataObjects/Person.php b/DataObjects/Person.php
index ac9c821..870139d 100644 (file)
--- a/DataObjects/Person.php
+++ b/DataObjects/Person.php
@@ -846,7 +846,7 @@ class Pman_Core_DataObjects_Person extends DB_DataObject
         
         if(!empty($q['query']['name'])){
             $this->whereAdd("
-                Person.name LIKE '%{$this->escape($q['query']['name'])}%'
+                {$this->tableName()}.name LIKE '%{$this->escape($q['query']['name'])}%'
             ");
         }
         
@@ -1009,7 +1009,7 @@ class Pman_Core_DataObjects_Person extends DB_DataObject
         // determine if it's staff!!!
         $owncomp = DB_DataObject::Factory('Companies');
         $owncomp->get('comptype', 'OWNER');
-        $isStaff = ($this->company_id ==  $owncomp->id);
+        $isStaff = ($au->company_id ==  $owncomp->id);
        
        
         if (!$isStaff) {