From: john <john@roojs.com>
Date: Mon, 9 Apr 2018 08:30:55 +0000 (+0800)
Subject: sync
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=949ef8513c62b4cabae3f36926f610385dce2032

sync
---

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index 12a02996..b8c7194f 100644
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -1181,8 +1181,6 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         $c = DB_DataObject::Factory('core_company');
         $tc =$c->count();
         
-        print_r($tc);exit;
-        
         if (!$tc || $tc> 1) {
             $roo->jerr("can not create initial user as multiple companies already exist");
         }
diff --git a/DataObjects/Core_setting.php b/DataObjects/Core_setting.php
index 93446754..c18dbec6 100644
--- a/DataObjects/Core_setting.php
+++ b/DataObjects/Core_setting.php
@@ -8,7 +8,7 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
     
     function initKeys()
     {
-        $d = $this->storedir;
+        $d = HTML_FlexyFramework::get()->Pman['storedir'].'/key';
         
         if(
             file_exists("{$d}/pub.key") ||