修复:模板包含错误

dxkite · Mar 20, 2017 · affb56e · affb56e
1 parent 2f953f6
commit affb56e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/system/src/suda/template/Compiler.php b/system/src/suda/template/Compiler.php
@@ -119,10 +119,9 @@ protected function parseEndwhile()
     }
 
     // include
-    protected function parseInclude($exp, array $includes=[])
+    protected function parseInclude($exp)
     {
-        preg_match('/^\(([\'"])(.+)(?1)/', $exp, $match);
-        return "<?php suda\\template\\Manager::include('{$match[2]}',\$v->_getVar()) ?>";
+        return "<?php suda\\template\\Manager::include{$exp} ?>";
     }
 
     protected function parseU($exp)
@@ -153,7 +152,7 @@ public static function echo($something)
     protected function parseStartInsert($exp)
     {
         preg_match('/\((.+)\)/', $exp, $v);
-        return '<?php suda\\template\\Manager::hook('.$v[1].',function ($v) { ?>';
+        return '<?php suda\\template\\Manager::hook('.$v[1].',function () { ?>';
     }
 
     protected function parseEndInsert()
@@ -163,7 +162,7 @@ protected function parseEndInsert()
     protected function parseInsert($exp)
     {
         preg_match('/^\(([\'"])(.+)(?1)/', $exp, $match);
-        return "<?php suda\\template\\Manager::exec('{$match[2]}',\$v) ?>";
+        return "<?php suda\\template\\Manager::exec('{$match[2]}') ?>";
     }
 
     // 错误报错

diff --git a/system/src/suda/template/Manager.php b/system/src/suda/template/Manager.php
@@ -101,11 +101,11 @@ public static function hook(string $name, $callback)
         self::$hooks[$name][]=new  \suda\tool\Command($callback);
     }
 
-    public static function exec(string $name, $var)
+    public static function exec(string $name)
     {
         if (isset(self::$hooks[$name])) {
             foreach (self::$hooks[$name] as $hook) {
-                $hook->exec([$var]);
+                $hook->exec();
             }
         }
     }