X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_locking.php;h=c720124554bf9c6f2b67864571eda2df2f50fcf6;hp=198e5d2049277d8be28347a459e20a87f434438b;hb=HEAD;hpb=499a4d2a40c2ea64e5ab02fe2e892b8ecb698aec

diff --git a/DataObjects/Core_locking.php b/DataObjects/Core_locking.php
index 198e5d20..c7201245 100644
--- a/DataObjects/Core_locking.php
+++ b/DataObjects/Core_locking.php
@@ -2,7 +2,7 @@
 /**
  * Table Definition for core company
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Core_locking extends DB_DataObject 
 {
@@ -10,7 +10,7 @@ class Pman_Core_DataObjects_Core_locking extends DB_DataObject
     /* the code below is auto generated do not remove the above tag */
 
     public $__table = 'core_locking';                    // table name
-    public $int;                             // int(11)  not_null primary_key auto_increment
+    public $id;                             // int(11)  not_null primary_key auto_increment
     public $on_table;                        // string(64)  not_null multiple_key
     public $on_id;                           // int(11)  not_null
     public $person_id;                       // int(11)  not_null
@@ -20,7 +20,7 @@ class Pman_Core_DataObjects_Core_locking extends DB_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
     function person() {
-        $p = DB_DataObjecT::factory('Person');
+        $p = DB_DataObject::factory('core_person');
         $p->get($this->person_id);
         return $p;
     }