From: john <john@roojs.com>
Date: Mon, 13 Aug 2018 05:20:17 +0000 (+0800)
Subject: sync
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=0de13d2cb4ebc9d64c7c0b56c1231d67b0c95a5b;ds=sidebyside

sync
---

diff --git a/DataObjects/Core_setting.php b/DataObjects/Core_setting.php
index d27007be..4a79b8be 100644
--- a/DataObjects/Core_setting.php
+++ b/DataObjects/Core_setting.php
@@ -72,7 +72,7 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
             return false;
         }
         
-        exec("mkdir -m775 {$key_dir}");
+        mkdir($key_dir, 0755, true);
         
         return $key_dir;
     }
@@ -136,6 +136,10 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
             return false;
         }
         
+        if(empty($this->is_encrypt)) {
+            return $this->val;
+        }
+        
         $key_dir = "{$dir}/pri.key";
         
         if(!file_exists($key_dir)) {