内核更新，多余文件清理

2016-07-01 18:04:46 +08:00
parent a595f3a13e
commit 0398e5bd80
31 changed files with 426 additions and 551 deletions
--- a/core/library/think/db/Query.php
+++ b/core/library/think/db/Query.php
@@ -1820,7 +1820,7 @@ class Query
        if (empty($options['fetch_sql']) && !empty($options['cache'])) {
            // 判断查询缓存
            $cache = $options['cache'];
-            if (true === $cache['key'] && !is_array($data)) {
+            if (true === $cache['key'] && !is_null($data) && !is_array($data)) {
                $key = 'think:' . $options['table'] . '|' . $data;
            } else {
                $key = is_string($cache['key']) ? $cache['key'] : md5(serialize($options));