修正include标签的bug

library/think/Template.php

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

tests/thinkphp/library/think/include.html

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

tests/thinkphp/library/think/include2.html

@@ -0,0 +1 @@
+include2

tests/thinkphp/library/think/templateTest.php

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