X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_person.php;fp=DataObjects%2FCore_person.php;h=5160b4e3ead0d217a4f6a128f2dbc39e12d374d3;hp=30b72af79887f21a7efb8ec068ac431fa7d661ce;hb=c8c28ad4fd428d676f271af4142af913d47f755a;hpb=586e4eb470252d837ba18b67e4c3c1702131fd1d

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index 30b72af7..5160b4e3 100644
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -602,6 +602,9 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
     
     function company()
     {
+        if (empty($this->company_id)) {
+            return false;
+        }
         $x = DB_DataObject::factory('core_company');
         $x->autoJoin();
         $x->get($this->company_id);
@@ -1160,7 +1163,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
     
     function setFromRoo($ar, $roo)
     {
-        $this->setFrom($ar);
+        $this->setFrom($ar); 
         
         if(!empty($ar['_enable_oath_key'])){
             $oath_key = $this->generateOathKey();
@@ -1181,7 +1184,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         }
         // this only applies to our owner company..
         $c = $this->company();
-        if (empty($c->comptype_name) || $c->comptype_name != 'OWNER') {
+        if (empty($c) || empty($c->comptype_name) || $c->comptype_name != 'OWNER') {
             return true;
         }