设置修正

dxkite · Nov 10, 2016 · 2c70fce · 2c70fce
1 parent e1539b0
commit 2c70fce
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/core/Query/Interface.php b/core/Query/Interface.php
@@ -16,7 +16,7 @@ public function exec():int;
     public function values(array $values);
     public function query(string $query, array $array=[]);
     public function error();
-    public function erron():int;
+    public function erron():string;
     // 是否链接成功
     public function good() :bool;
     // 事务系列

diff --git a/core/Query/PdoMySQL_Query.php b/core/Query/PdoMySQL_Query.php
@@ -80,10 +80,9 @@ public function error()
         }
         return false;
     }
-    public function erron():int
+    public function erron():string
     {
         if ($this->stmt) {
-                        var_dump($this->stmt->errorCode());
             return $this->stmt->errorCode();
         }
         return false;
@@ -103,10 +102,11 @@ protected function lazyQuery(string $query, array $array=[])
         if ($this->database && $this->dbchange) {
             if (self::$pdo->query('USE '.$this->database)) {
                 $this->dbchange=false;
+                $this->database=null;
             } else {
                 die('Could not select database:'.$this->database);
             }
-        } elseif (!is_null($this->database)) {
+        } elseif (is_null($this->database)) {
             if (self::$pdo->query('USE '.conf('Database.dbname'))) {
                 $this->database=conf('Database.dbname');
             } else {

diff --git a/lib/Site/Options.php b/lib/Site/Options.php
@@ -24,11 +24,6 @@ public static function init()
         } else {
             return false;
         }
-        foreach ($options as $option) {
-            self::$options[$option['name']] = $option['value'];
-        }
-        self::$options['powered'] = 'DxSite '.CORE_VERSION;
-        self::$options['poweredUrl'] = 'https://github.com/DXkite/DxSite/releases/latest';
         return true;
     }
 
@@ -52,7 +47,12 @@ public static function refresh():bool
     {
         $sql = 'SELECT * FROM `#{site_options}`';
         $q = new Query($sql);
-        self::$options = $q->fetchAll();
+        $options = $q->fetchAll();
+        foreach ($options as $option) {
+            self::$options[$option['name']] = $option['value'];
+        }
+        self::$options['powered'] = 'DxSite '.CORE_VERSION;
+        self::$options['poweredUrl'] = 'https://github.com/DXkite/DxSite/releases/latest';
         Cache::set('SiteOption', self::$options, 0);
         return $q->erron() === 0;
     }
@@ -62,10 +62,10 @@ public static function getSiteOptions()
         $q = new Query($sql);
         return  $q->fetchAll();
     }
-    public static function setOption(string $name,string $value)
+    public static function setOption(string $name, string $value)
     {
         $sql='UPDATE `#{site_options}` SET `value`=:value WHERE `name`=:name LIMIT 1;';
-        return (new Query($sql,['name'=>$name,'value'=>$value]))->exec();
+        return (new Query($sql, ['name'=>$name, 'value'=>$value]))->exec();
     }
     /**
      * 魔术方法获取设置