aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2019-10-20 20:53:34 +0200
committerKim Alvefur <zash@zash.se>2019-10-20 20:53:34 +0200
commit08da054c776b8a1618acaa3827a40fa849499bb6 (patch)
treee12e22f45769caf55de9030483ba480fd772df30
parent4caf87fa9d93fb224dbc5492a5f20adb845d27c5 (diff)
parent9bd711b194dfc280f55bd7762eca8feac331f28c (diff)
downloadprosody-08da054c776b8a1618acaa3827a40fa849499bb6.tar.gz
prosody-08da054c776b8a1618acaa3827a40fa849499bb6.zip
Merge 0.11->trunk
-rw-r--r--util/interpolation.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/util/interpolation.lua b/util/interpolation.lua
index 315cc203..e0ccf47b 100644
--- a/util/interpolation.lua
+++ b/util/interpolation.lua
@@ -32,7 +32,7 @@ local function new_render(pat, escape, funcs)
-- assert(type(values) == "table", "bad argument #2 to 'render' (table expected)");
return (s_gsub(template, pat, function (block)
block = s_sub(block, 2, -2);
- local name, opt, e = s_match(block, "^([%a_][%w_.]*)(%p?)()");
+ local name, raw, opt, e = s_match(block, "^([%a_][%w_.]*)(!?)(%p?)()");
if not name then return end
local value = values[name];
if not value and name:find(".", 2, true) then
@@ -45,7 +45,7 @@ local function new_render(pat, escape, funcs)
if funcs then
while value ~= nil and opt == '|' do
local f;
- f, opt, e = s_match(block, "^([%a_][%w_.]*)(%p?)()", e);
+ f, raw, opt, e = s_match(block, "^([%a_][%w_.]*)(!?)(%p?)()", e);
f = funcs[f];
if f then value = f(value); end
end
@@ -70,7 +70,7 @@ local function new_render(pat, escape, funcs)
if type(value) ~= "string" then
value = tostring(value);
end
- if opt ~= '!' then
+ if raw ~= '!' then
return escape(value);
end
return value;