From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Fri, 29 Jul 2016 13:35:12 +0000 (+0200)
Subject: Pass variables from current scope in LangCompilerTemplatePlugin
X-Git-Tag: 3.0.0_Beta_1~916^2~1^2~2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c9a530df71da8bc7acf73c044ceb17c5bb2b25d5;p=GitHub%2FWoltLab%2FWCF.git

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.
---

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 "<?php
-			\$this->tagStack[] = array('lang', array($tagArgs));
+			\$this->tagStack[] = array('lang', array_merge(\$this->v, array($tagArgs)));
 			ob_start();
 			?>";
 	}