DataObjects/Core_company.php

[Pman.Core] / DataObjects / Core_group_member.php

diff --git a/DataObjects/Core_group_member.php b/DataObjects/Core_group_member.php
index 1e75398..272aa06 100755 (executable)
--- a/DataObjects/Core_group_member.php
+++ b/DataObjects/Core_group_member.php
@@ -2,7 +2,7 @@
 /**
  * Table Definition for Group_Members
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Core_group_member extends DB_DataObject 
 {
@@ -25,7 +25,7 @@ class Pman_Core_DataObjects_Core_group_member extends DB_DataObject
     
     function change($person, $group, $state)
     {
-        $gm = DB_DataObject::factory('core_group_member');
+        $gm = DB_DataObject::factory($this->tableName());
         $gm->group_id = $group->id;
         $gm->user_id = $person->id;
         $gm->find(true);
@@ -56,7 +56,7 @@ class Pman_Core_DataObjects_Core_group_member extends DB_DataObject
         $t = clone($this);
         //DB_DataObject::debugLevel(1);
          
-        $grp = DB_DataObject::factory('Groups');
+        $grp = DB_DataObject::factory('core_group');
         $t->joinAdd($grp , 'LEFT');
         //$person->id = (int)$person->id;
         $t->whereAdd("