From 20eaa4f5b8bf6444867bfaf95f14e4685aed5aea Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Sat, 18 Jun 2016 23:10:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3Cookie=E7=B1=BB=E7=9A=84has?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Cookie.php   | 2 +-
 library/think/db/Query.php | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/library/think/Cookie.php b/library/think/Cookie.php
index 30ff81d4..78b89786 100644
--- a/library/think/Cookie.php
+++ b/library/think/Cookie.php
@@ -105,7 +105,7 @@ class Cookie
     {
         $prefix = !is_null($prefix) ? $prefix : self::$config['prefix'];
         $name   = $prefix . $name;
-        return isset($_COOKIE[$name]) ? $value: null;
+        return isset($_COOKIE[$name]);
     }
 
     /**
diff --git a/library/think/db/Query.php b/library/think/db/Query.php
index 3d1eb166..ae315771 100644
--- a/library/think/db/Query.php
+++ b/library/think/db/Query.php
@@ -856,11 +856,10 @@ class Query
     /**
      * 分析查询表达式
      * @access public
-     * @param string $logic 查询逻辑
+     * @param string $logic 查询逻辑 and or xor
      * @param string|array|\Closure $field 查询字段
      * @param mixed $op 查询表达式
      * @param mixed $condition 查询条件
-     * @param string $logic and or xor
      * @param array $param 查询参数
      * @return void
      */