DataObjects/Core_project.php

[Pman.Core] / DataObjects / Core_person.php

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index 23f19ea..2556a2f 100644 (file)
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -254,7 +254,6 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
     //   ---------------- authentication / passwords and keys stuff  ----------------
     function isAuth()
     {
-        
         @session_start();
        
         $ff= HTML_FlexyFramework::get();
@@ -648,9 +647,12 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
             $im->limit(1);
             $im->selectAdd();
             $im->selectAs($im,  'company_id_logo_id_%s');
-            if ($im->find(true) && $im->array()) {
-                    
+            if ($im->find(true)) {
+                
                 foreach($im->toArray() as $k=>$v) {
+                    if (!preg_match('/^company_id_logo_id_/', $k)) {
+                        continue;
+                    }
                     $aur[$k] = $v;
                 }
             }
@@ -1180,6 +1182,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         }
         $c = DB_DataObject::Factory('core_company');
         $tc = $c->count();
+        
         if (!$tc || $tc> 1) {
             $roo->jerr("can not create initial user as multiple companies already exist");
         }