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 19:27:20 +08:00
parent 3ce0120251
commit 58de4d7cc3
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/think/Template.php
View File

@@ -771,18 +771,18 @@ class Template
switch ($first) { switch ($first) {
case '?': case '?':
// {$varname??'xxx'} $varname有定义则输出$varname,否则输出xxx // {$varname??'xxx'} $varname有定义则输出$varname,否则输出xxx
$str = '<?php echo ' . ($express ?: 'isset(' . $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(' . ($express ?: '!empty(' . $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 ' . ($express ?: '!empty(' . $name . ') ') . '?' . $name . $str . '; ?>'; $str = '<?php echo ' . ($express ?: '!empty(' . $name . ')') . '?' . $name . $str . '; ?>';
break; break;
default: default:
$str = '<?php echo ' . ($express ?: '!empty(' . $name . ') ') . '?' . $str . '; ?>'; $str = '<?php echo ' . ($express ?: '!empty(' . $name . ')') . '?' . $str . '; ?>';
} }
} }
} else { } else {

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

@@ -38,7 +38,7 @@ EOF;
{\$name.a??'test'} {\$name.a??'test'}
EOF; EOF;
$data = <<<EOF $data = <<<EOF
<?php echo isset(\$name['a']) ? \$name['a'] : 'test'; ?> <?php echo isset(\$name['a'])?\$name['a']:'test'; ?>
EOF; EOF;
$template->parse($content); $template->parse($content);