From c01fb973376c5a77ec56e0885e23306c46ecf435 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Thu, 29 Jan 2015 16:52:04 +0100 Subject: [PATCH] Don't escape macros for the macro() function refs #7564 --- lib/icinga/macroprocessor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/icinga/macroprocessor.cpp b/lib/icinga/macroprocessor.cpp index 4fc2434c44a..e8e6259ba5f 100644 --- a/lib/icinga/macroprocessor.cpp +++ b/lib/icinga/macroprocessor.cpp @@ -180,7 +180,7 @@ Value MacroProcessor::EvaluateFunction(const Function::Ptr& func, const Resolver } resolvers_this->Set("macro", new Function(boost::bind(&MacroProcessor::InternalResolveMacrosShim, - _1, boost::cref(resolvers), cr, missingMacro, boost::cref(escapeFn), resolvedMacros, useResolvedMacros, + _1, boost::cref(resolvers), cr, missingMacro, MacroProcessor::EscapeCallback(), resolvedMacros, useResolvedMacros, recursionLevel))); ScriptFrame frame(resolvers_this);