X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FProjectDirectory.php;h=f494e3c6f44545e40574c068904516fa24ea0ad4;hp=f1f8dee91dc0eec52e9485e09445d3e697a3947d;hb=HEAD;hpb=762a258f856e097106ebec1a9d56da96d939b374

diff --git a/DataObjects/ProjectDirectory.php b/DataObjects/ProjectDirectory.php
index f1f8dee9..f494e3c6 100644
--- a/DataObjects/ProjectDirectory.php
+++ b/DataObjects/ProjectDirectory.php
@@ -5,7 +5,7 @@
  * Note - projectdirectory is linked to this - due to an issue with postgres - we should keep to lowercase names only for tables..
  * 
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_ProjectDirectory extends DB_DataObject 
 {
@@ -175,7 +175,7 @@ class Pman_Core_DataObjects_ProjectDirectory extends DB_DataObject
         
         
         $pd = DB_DataObject::factory('ProjectDirectory');
-        $pd->joinAdd(DB_DataObject::factory('Projects'), 'LEFT');
+        $pd->joinAdd(DB_DataObject::factory('core_project'), 'LEFT');
         $pd->whereAdd("Projects.type NOT IN ('N','X')");
         $pd->person_id = $au->id;