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

修正include标签的bug

Browse Source
This commit is contained in:
oldrind
2016-02-17 18:50:47 +08:00
parent 40785632ac
commit bfe8f24763
4 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/Template.php
View File

@@ -404,9 +404,9 @@ class Template
} }
$parseStr = str_replace('[' . $k . ']', $v, $parseStr); $parseStr = str_replace('[' . $k . ']', $v, $parseStr);
} }
$content = str_replace($match[0], $parseStr, $content);
// 再次对包含文件进行模板分析 // 再次对包含文件进行模板分析
$funReplace($parseStr); $funReplace($parseStr);
$content = str_replace($match[0], $parseStr, $content);
} }
unset($matches); unset($matches);
} }

1
tests/thinkphp/library/think/include.html
View File

@@ -1 +1,2 @@
<input name="[name]" value="[value]"> <input name="[name]" value="[value]">
{include file="include2" /}

1
tests/thinkphp/library/think/include2.html Normal file
View File

@@ -0,0 +1 @@
include2

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

@@ -266,9 +266,11 @@ EOF;
<nav> <nav>
<div> <div>
<input name="info" value="<?php echo \$info['value']; ?>"> <input name="info" value="<?php echo \$info['value']; ?>">
include2
<input name="<?php echo \$user['name']; ?>" value="<?php echo \$user['account']; ?>"> <input name="<?php echo \$user['name']; ?>" value="<?php echo \$user['account']; ?>">
include2
<?php echo \$message; ?>{\$message} <?php echo \$message; ?>{\$message}