From 419500e55e2e5336deeabac78f51d348cea636f1 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Fri, 12 Aug 2016 13:32:13 +0200 Subject: [PATCH] Fix 'use' keyword for templates fixes #12409 --- lib/config/expression.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/config/expression.cpp b/lib/config/expression.cpp index 7c1807164..14f52ac48 100644 --- a/lib/config/expression.cpp +++ b/lib/config/expression.cpp @@ -751,6 +751,11 @@ ExpressionResult ImportExpression::DoEvaluate(ScriptFrame& frame, DebugHint *dhi if (!item) BOOST_THROW_EXCEPTION(ScriptError("Import references unknown template: '" + name + "'", m_DebugInfo)); + Dictionary::Ptr scope = item->GetScope(); + + if (scope) + scope->CopyTo(frame.Locals); + ExpressionResult result = item->GetExpression()->Evaluate(frame, dhint); CHECK_RESULT(result); -- 2.49.0