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

改进

Browse Source
This commit is contained in:
thinkphp
2017-07-25 17:49:17 +08:00
parent da03ea07e9
commit 1b9cef6232
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
library/think/Template.php
View File

@@ -763,32 +763,26 @@ class Template
} else { } else {
if (isset($array[1])) { if (isset($array[1])) {
$this->parseVar($array[2]); $this->parseVar($array[2]);
$_name = ' && ' . $name . $array[1] . $array[2]; $express = $name . $array[1] . $array[2];
} else { } else {
$_name = ''; $express = false;
} }
// $name为数组 // $name为数组
switch ($first) { switch ($first) {
case '?': case '?':
// {$varname??'xxx'} $varname有定义则输出$varname,否则输出xxx // {$varname??'xxx'} $varname有定义则输出$varname,否则输出xxx
$str = '<?php echo isset(' . $name . ')' . $_name . ' ? ' . $name . ' : ' . substr($str, 1) . '; ?>'; $str = '<?php echo ' . ($express ?: 'isset(' . $name . ') ') . ' ? ' . $name . ' : ' . substr($str, 1) . '; ?>';
break; break;
case '=': case '=':
// {$varname?='xxx'} $varname为真时才输出xxx // {$varname?='xxx'} $varname为真时才输出xxx
$str = '<?php if(!empty(' . $name . ')' . $_name . ') echo ' . substr($str, 1) . '; ?>'; $str = '<?php if(' . ($express ?: '!empty(' . $name . ') ') . ') echo ' . substr($str, 1) . '; ?>';
break; break;
case ':': case ':':
// {$varname?:'xxx'} $varname为真时输出$varname,否则输出xxx // {$varname?:'xxx'} $varname为真时输出$varname,否则输出xxx
$str = '<?php echo !empty(' . $name . ')' . $_name . '?' . $name . $str . '; ?>'; $str = '<?php echo ' . ($express ?: '!empty(' . $name . ') ') . '?' . $name . $str . '; ?>';
break; break;
default: default:
if (isset($array[1])) { $str = '<?php echo ' . ($express ?: '!empty(' . $name . ') ') . '?' . $str . '; ?>';
$this->parseVar($array[2]);
$name = $name . $array[1] . $array[2];
} else {
$name = '!empty(' . $name . ')';
}
$str = '<?php echo ' . $name . '?' . $str . '; ?>';
} }
} }
} else { } else {

4
tests/thinkphp/library/think/templateTest.php
View File

@@ -78,7 +78,7 @@ EOF;
{\$name.a==\$name.b?='test'} {\$name.a==\$name.b?='test'}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php if(!empty(\$name['a']) && \$name['a']==\$name['b']) echo 'test'; ?> <?php if(\$name['a']==\$name['b']) echo 'test'; ?>
EOF; EOF;
$template->parse($content); $template->parse($content);
@@ -88,7 +88,7 @@ EOF;
{\$name.a==\$name.b?'a':'b'} {\$name.a==\$name.b?'a':'b'}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php echo !empty(\$name['a']) && \$name['a']==\$name['b']?'a':'b'; ?> <?php echo \$name['a']==\$name['b']?'a':'b'; ?>
EOF; EOF;
$template->parse($content); $template->parse($content);