1.修复后台无法退出的bug

2.更新tp内核
2016-09-12 10:21:09 +08:00
parent 0234fb3d95
commit 1f544d0d59
17 changed files with 274 additions and 213 deletions
--- a/core/library/think/db/Connection.php
+++ b/core/library/think/db/Connection.php
@@ -733,11 +733,12 @@ abstract class Connection
     * SQL指令安全过滤
     * @access public
     * @param string $str SQL字符串
+     * @param bool   $master 是否主库查询
     * @return string
     */
-    public function quote($str)
+    public function quote($str, $master = false)
    {
-        $this->initConnect();
+        $this->initConnect($master);
        return $this->linkID ? $this->linkID->quote($str) : $str;
    }