From 4d544b484374606b813b3c4143c8f2a55ab0b94a Mon Sep 17 00:00:00 2001 From: Tindy X <49061470+tindy2013@users.noreply.github.com> Date: Tue, 14 Apr 2020 18:42:58 +0800 Subject: [PATCH] Fix incorrect argument count for find in template Add managed_config_prefix to global variables in template. --- src/interfaces.cpp | 1 + src/templates.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/interfaces.cpp b/src/interfaces.cpp index b306b84..a15b081 100644 --- a/src/interfaces.cpp +++ b/src/interfaces.cpp @@ -765,6 +765,7 @@ void readConf() continue; global_vars[x.first] = x.second; } + global_vars["managed_config_prefix"] = managed_config_prefix; ini.EnterSection("server"); ini.GetIfExist("listen", listen_address); diff --git a/src/templates.cpp b/src/templates.cpp index 2535d80..905954f 100644 --- a/src/templates.cpp +++ b/src/templates.cpp @@ -50,7 +50,7 @@ int render_template(const std::string &content, const template_args &vars, std:: std::string data = args.at(0)->get(); return trim(data); }); - m_callbacks.add_callback("find", 1, [](inja::Arguments &args) + m_callbacks.add_callback("find", 2, [](inja::Arguments &args) { std::string src = args.at(0)->get(), target = args.at(1)->get(); return regFind(src, target);