From c9a530df71da8bc7acf73c044ceb17c5bb2b25d5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim=20D=C3=BCsterhus?= Date: Fri, 29 Jul 2016 15:35:12 +0200 Subject: [PATCH] Pass variables from current scope in LangCompilerTemplatePlugin This is needed in case the Template is evaluated by the EmailTemplateEngine, as dynamic language variables use the variables of the regular TemplateEngine. --- .../system/template/plugin/LangCompilerTemplatePlugin.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wcfsetup/install/files/lib/system/template/plugin/LangCompilerTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/LangCompilerTemplatePlugin.class.php index efb4b9e7f1..ac744fd88c 100644 --- a/wcfsetup/install/files/lib/system/template/plugin/LangCompilerTemplatePlugin.class.php +++ b/wcfsetup/install/files/lib/system/template/plugin/LangCompilerTemplatePlugin.class.php @@ -23,7 +23,7 @@ class LangCompilerTemplatePlugin implements ICompilerTemplatePlugin { $tagArgs = $compiler->makeArgString($tagArgs); return "tagStack[] = array('lang', array($tagArgs)); + \$this->tagStack[] = array('lang', array_merge(\$this->v, array($tagArgs))); ob_start(); ?>"; } -- 2.20.1