From 802ead16a855e6704bdfce6caca2424bc70f6451 Mon Sep 17 00:00:00 2001 From: thinkphp Date: Tue, 28 Jun 2016 17:05:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=87=A0=E5=A4=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- library/think/App.php | 2 +- library/think/File.php | 4 ++-- library/think/db/Builder.php | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/library/think/App.php b/library/think/App.php index 266475f2..b927071d 100644 --- a/library/think/App.php +++ b/library/think/App.php @@ -162,7 +162,7 @@ class App * @param array $params 参数 * @return void */ - public static function dispatch($dispath, $type = 'module', $params = []) + public static function dispatch($dispatch, $type = 'module', $params = []) { self::$dispatch = ['type' => $type, $type => $dispatch, 'params' => $params]; } diff --git a/library/think/File.php b/library/think/File.php index 6701d93d..ef5d69da 100644 --- a/library/think/File.php +++ b/library/think/File.php @@ -29,9 +29,9 @@ class File extends SplFileObject // 上传文件信息 protected $info; - public function __construct($filename, $mode = 'r', $useIncludePath = false, $context = null) + public function __construct($filename, $mode = 'r') { - parent::__construct($filename, $mode, $useIncludePath, $context); + parent::__construct($filename, $mode); $this->filename = $this->getRealPath(); } diff --git a/library/think/db/Builder.php b/library/think/db/Builder.php index f07eca0c..ab95753d 100644 --- a/library/think/db/Builder.php +++ b/library/think/db/Builder.php @@ -138,8 +138,6 @@ abstract class Builder { if (is_string($value)) { $value = strpos($value, ':') === 0 && $this->query->isBind(substr($value, 1)) ? $value : $this->connection->quote($value); - } elseif (is_array($value) && is_string($value[0]) && strtolower($value[0]) == 'exp') { - $value = $value[1]; } elseif (is_array($value)) { $value = array_map([$this, 'parseValue'], $value); } elseif (is_bool($value)) {