diff --git a/library/think/Template.php b/library/think/Template.php index 2855cbcb26..976d255c25 100644 --- a/library/think/Template.php +++ b/library/think/Template.php @@ -541,8 +541,8 @@ private function parseInclude(&$content) foreach ($array as $k => $v) { // 以$开头字符串转换成模板变量 - if (0 === strpos($v, '$')) { - $v = $this->get(substr($v, 1)); + if (0 === strpos($v, '$') || 0 === strpos($v, ':')) { + $v = '{' . $v . '}'; } $parseStr = str_replace('[' . $k . ']', $v, $parseStr); @@ -1290,6 +1290,7 @@ private function getRegex($tagName) break; case 'include': $name = 'file'; + // no break case 'taglib': case 'layout': case 'extend':