内核更新

2016-09-26 13:55:47 +08:00
parent 863f6a1cd0
commit 7608d4d0f7
17 changed files with 213 additions and 79 deletions
--- a/core/library/think/Template.php
+++ b/core/library/think/Template.php
@@ -127,6 +127,8 @@ class Template
            $this->config = array_merge($this->config, $config);
        } elseif (isset($this->config[$config])) {
            return $this->config[$config];
+        } else {
+            return null;
        }
    }