diff --git a/library/think/Template.php b/library/think/Template.php index f22b3297..c82850c3 100644 --- a/library/think/Template.php +++ b/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; } } diff --git a/library/think/view/driver/Php.php b/library/think/view/driver/Php.php index 06f49a6a..31fe7807 100644 --- a/library/think/view/driver/Php.php +++ b/library/think/view/driver/Php.php @@ -143,6 +143,8 @@ class Php { if (is_array($name)) { $this->config = array_merge($this->config, $name); + } elseif (is_null($value)) { + return isset($this->config[$name]) ? $this->config[$name] : null; } else { $this->config[$name] = $value; } diff --git a/library/think/view/driver/Think.php b/library/think/view/driver/Think.php index e82f5139..33729b44 100644 --- a/library/think/view/driver/Think.php +++ b/library/think/view/driver/Think.php @@ -130,17 +130,19 @@ class Think } /** - * 配置模板引擎 + * 配置或者获取模板引擎参数 * @access private * @param string|array $name 参数名 * @param mixed $value 参数值 - * @return void + * @return mixed */ public function config($name, $value = null) { if (is_array($name)) { $this->template->config($name); $this->config = array_merge($this->config, $name); + } elseif (is_null($value)) { + return $this->template->config($name); } else { $this->template->$name = $value; $this->config[$name] = $value;