From 1e9cd56a2e24138150fe9709ae19912f8acef97c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=83=A1?= <3203164629@qq.com>
Date: Wed, 31 Jan 2024 08:27:43 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BE=A4=E7=BB=84=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E6=97=A0=E6=B3=95=E9=80=89=E6=8B=A9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 小胡 <3203164629@qq.com>
---
 core/class/class_template.php | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/core/class/class_template.php b/core/class/class_template.php
index 8d0c920..9d0abaa 100644
--- a/core/class/class_template.php
+++ b/core/class/class_template.php
@@ -144,8 +144,7 @@ class template {
 	}
 
 	function parse_template(&$template) {
-		$template = str_replace('self.$', 'self.＄', $template);
-		$var_regexp = "((?!\\\$[a-zA-Z]+\()(\\\$[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*(\-\>)?[a-zA-Z0-9_\x7f-\xff]*)(\[[a-zA-Z0-9_\-\.\"\'\[\]\$\x7f-\xff]+\])*)";
+		$var_regexp = "((\\\$[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*(\-\>)?[a-zA-Z0-9_\x7f-\xff]*)(\[[a-zA-Z0-9_\-\.\"\'\[\]\$\x7f-\xff]+\])*)";
 		$const_regexp = "([A-Z_\x7f-\xff][A-Z0-9_\x7f-\xff]*)";
 
 		$template = preg_replace("/([\n\r]+)\t+/s", "\\1", $template);
@@ -175,7 +174,7 @@ class template {
 		$template = str_replace("{LF}", "<?=\"\\n\"?>", $template);
 		$template = preg_replace("/\{(\\\$[a-zA-Z0-9_\-\>\[\]\'\"\$\.\x7f-\xff]+)\}/s", "<?=\\1?>", $template);
         $template = preg_replace_callback("/[\n\r\t]*\{Hook\s+([\w]+)\}[\n\r\t]*/is", array($this, 'parse_template_callback_hook'), $template);//钩子解析
-        $template = preg_replace_callback("/[\n\r\t]*\{Hook\s+([\w]+)\#(.+?)\#\}[\n\r\t]*/is", array($this, 'parse_template_callback_hook_1'), $template);//钩子解析,传参形式
+        //$template = preg_replace_callback("/[\n\r\t]*\{Hook\s+([\w]+)\#(.+?)\#\}[\n\r\t]*/is", array($this, 'parse_template_callback_hook'), $template);//钩子解析,传参形式
 		$template = preg_replace_callback("/$var_regexp/s", array($this, 'parse_template_callback_addquote_1'), $template);
 		$template = preg_replace_callback("/\<\?\=\<\?\=$var_regexp\?\>\?\>/s", array($this, 'parse_template_callback_addquote_1'), $template);
 
@@ -200,7 +199,6 @@ class template {
 		$template = preg_replace_callback("/[\n\r\t]*\{block\s+([a-zA-Z0-9_\[\]]+)\}(.+?)\{\/block\}/is", array($this, 'parse_template_callback_stripblock_12'), $template);
 		$template = preg_replace("/\<\?(\s{1})/is", "<?php\\1", $template);
 		$template = preg_replace("/\<\?\=(.+?)\?\>/is", "<?php echo \\1;?>", $template);
-		$template = str_replace('self.＄','self.$',  $template);
 	}
 
 	function parse_template_callback_javascript($matches) {
@@ -208,11 +206,9 @@ class template {
 	}
 
     function parse_template_callback_hook($matches){
-        return "<?php Hook::listen('".$matches[1]."'); ?>";
-    }
-   function parse_template_callback_hook_1($matches){
-	   $param=array($matches[2]);
-        return "<?php Hook::listen('".$matches[1]."',".$param.");?>"; //传参形式
+
+        //return "<?php Hook::listen('".$matches[1]."',$".$matches[2].") //传参形式
+        return "<?php Hook::listen('".$matches[1]."') ?>";
     }
 
 	function replace_js_language_var($arr) {
@@ -596,4 +592,4 @@ class template {
 	}
 
 }
-?>
+?>
\ No newline at end of file