From 2e930bd2a5074a991d374db70f8454dc031283b5 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Sun, 11 Sep 2016 12:47:51 +0800
Subject: [PATCH] =?UTF-8?q?Connection=E7=B1=BBquote=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0master=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/db/Connection.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/library/think/db/Connection.php b/library/think/db/Connection.php
index babd6ba8..6cbbd525 100644
--- a/library/think/db/Connection.php
+++ b/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;
     }