tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't escape macros for the macro() function 

refs #7564
This commit is contained in:
Gunnar Beutner 2015-01-29 16:52:04 +01:00
parent e0be9cd743
commit c01fb97337
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/icinga/macroprocessor.cpp
View File

@ -180,7 +180,7 @@ Value MacroProcessor::EvaluateFunction(const Function::Ptr& func, const Resolver
} }
resolvers_this->Set("macro", new Function(boost::bind(&MacroProcessor::InternalResolveMacrosShim, 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))); recursionLevel)));
ScriptFrame frame(resolvers_this); ScriptFrame frame(resolvers_this);