projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
handle empty companies
[Pman.Core]
/
DataObjects
/
Core_person.php
diff --git
a/DataObjects/Core_person.php
b/DataObjects/Core_person.php
index
30b72af
..
5160b4e
100644
(file)
--- 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()
{
function company()
{
+ if (empty($this->company_id)) {
+ return false;
+ }
$x = DB_DataObject::factory('core_company');
$x->autoJoin();
$x->get($this->company_id);
$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)
{
function setFromRoo($ar, $roo)
{
- $this->setFrom($ar);
+ $this->setFrom($ar);
if(!empty($ar['_enable_oath_key'])){
$oath_key = $this->generateOathKey();
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();
}
// 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;
}
return true;
}