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 */