mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-08 07:32:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复switch...case模板标签嵌套解析错误

Browse Source
This commit is contained in:
Haotong Lin
2015-12-17 13:28:28 +08:00
parent 1481732c33
commit 66f433330d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/template.php
View File

@@ -495,7 +495,7 @@ class Template
foreach ($tLib->getTags() as $name => $val) { foreach ($tLib->getTags() as $name => $val) {
$tags = [$name]; $tags = [$name];
if (isset($val['alias'])) { if (isset($val['alias'])) {
// 别名设置 // 别名设置
$tags = explode(',', $val['alias']); $tags = explode(',', $val['alias']);
$tags[] = $name; $tags[] = $name;
} }
@@ -659,10 +659,10 @@ class Template
//模板函数过滤 //模板函数过滤
$fun = strtolower(trim($args[0])); $fun = strtolower(trim($args[0]));
switch ($fun) { switch ($fun) {
case 'default': // 特殊模板函数 case 'default': // 特殊模板函数
$name = '(' . $name . ')?(' . $name . '):' . $args[1]; $name = '(' . $name . ')?(' . $name . '):' . $args[1];
break; break;
default: // 通用模板函数 default: // 通用模板函数
if (!in_array($fun, $template_deny_funs)) { if (!in_array($fun, $template_deny_funs)) {
if (isset($args[1])) { if (isset($args[1])) {
if (strstr($args[1], '###')) { if (strstr($args[1], '###')) {

2
library/think/template/taglib/cx.php
View File

@@ -33,7 +33,7 @@ class Cx extends Taglib
'elseif' => ['attr' => 'condition', 'close' => 0], 'elseif' => ['attr' => 'condition', 'close' => 0],
'else' => ['attr' => '', 'close' => 0], 'else' => ['attr' => '', 'close' => 0],
'switch' => ['attr' => 'name', 'level' => 2], 'switch' => ['attr' => 'name', 'level' => 2],
'case' => ['attr' => 'value,break'], 'case' => ['attr' => 'value,break', 'level' => 2],
'default' => ['attr' => '', 'close' => 0], 'default' => ['attr' => '', 'close' => 0],
'compare' => ['attr' => 'name,value,type', 'level' => 3, 'alias' => 'eq,equal,notequal,neq,gt,lt,egt,elt,heq,nheq'], 'compare' => ['attr' => 'name,value,type', 'level' => 3, 'alias' => 'eq,equal,notequal,neq,gt,lt,egt,elt,heq,nheq'],
'range' => ['attr' => 'name,value,type', 'level' => 3, 'alias' => 'in,notin,between,notbetween'], 'range' => ['attr' => 'name,value,type', 'level' => 3, 'alias' => 'in,notin,between,notbetween'],