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

sync
---

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index 2a6e73c3..b80ef81c 100644
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -1180,8 +1180,6 @@ 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");
         }
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") ||