mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 05:37:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.interpolation: Support unescaped variables with more modifiers (fixes #1452)

Browse source 
Tests will be added in trunk.
This commit is contained in:
Kim Alvefur 2019-10-20 20:52:14 +02:00
parent e48914fdd7
commit 9bd711b194
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
util/interpolation.lua
View file

@ -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;