]> granicus.if.org Git - icinga2/commitdiff
Fix 'use' keyword for templates
authorGunnar Beutner <gunnar.beutner@netways.de>
Fri, 12 Aug 2016 11:32:13 +0000 (13:32 +0200)
committerGunnar Beutner <gunnar.beutner@netways.de>
Fri, 12 Aug 2016 11:32:13 +0000 (13:32 +0200)
fixes #12409

lib/config/expression.cpp

index 7c18071644fecf3e8f087691f4b6b5eef65ee72d..14f52ac4896c13330d98411d276dfb967825bc92 100644 (file)
@@ -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);