内核代码升级

2016-09-08 16:38:09 +08:00
parent acd3e6fa25
commit 7201db324e
19 changed files with 86 additions and 48 deletions
--- a/core/library/think/Loader.php
+++ b/core/library/think/Loader.php
@@ -452,13 +452,14 @@ class Loader
    }

    /**
-     * 实例化数据库
-     * @param mixed $config 数据库配置
-     * @return object
+     * 数据库初始化 并取得数据库类实例
+     * @param mixed         $config 数据库配置
+     * @param bool|string   $name 连接标识 true 强制重新连接
+     * @return \think\db\Connection
     */
-    public static function db($config = [])
+    public static function db($config = [], $name = false)
    {
-        return Db::connect($config);
+        return Db::connect($config, $name);
    }

    /**