]> granicus.if.org Git - icinga2/commitdiff
Don't escape macros for the macro() function
authorGunnar Beutner <gunnar@beutner.name>
Thu, 29 Jan 2015 15:52:04 +0000 (16:52 +0100)
committerGunnar Beutner <gunnar@beutner.name>
Thu, 29 Jan 2015 15:52:04 +0000 (16:52 +0100)
refs #7564

lib/icinga/macroprocessor.cpp

index 4fc2434c44a9e0baf3780f3aaf431f9760981bce..e8e6259ba5f108eb9f023676ed4e9831cce992bc 100644 (file)
@@ -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);