X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_person.php;fp=DataObjects%2FCore_person.php;h=b72ecbe0e497d66ab74cc2dd4a868d2a48ade211;hp=12a97936e2f88f71c90c11f6c87f86255fdf4930;hb=ee1b0a9d018f5fa6cc582773ead32ff4c24a3ce9;hpb=967904efd6ed4fbaa3c16c0872b9248e632b3108

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index 12a97936..b72ecbe0 100644
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -640,14 +640,12 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
     
     function authUserArray()
     {
-        
         $aur = $this->toArray();
         
         if ($this->id < 1) {
             return $aur;
         }
         
-        
         //DB_DataObject::debugLevel(1);
         $c = DB_Dataobject::factory('core_company');
         $im = DB_Dataobject::factory('Images');
@@ -697,6 +695,17 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         $oath_require = $s->lookup('core', 'two_factor_auth_required');
         $aur['require_oath'] = $oath_require ?  $oath_require->val : 0;
         
+        $aur['core_person_settings'] = array();
+                
+        $core_person_settings = DB_DataObject::factory('core_person_settings');
+        $core_person_settings->setFrom(array(
+            'person_id' => $this->id
+        ));
+        
+        foreach ($core_person_settings->fetchAll() as $k => $v) {
+            $aur['core_person_settings'][$v->scope] = $v->toArray();
+        }
+        
         return $aur;
     }