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

util.xtemplate: Fix error on applying each() to zero stanzas

Browse source
This commit is contained in:
Kim Alvefur 2024-07-11 15:04:29 +02:00
parent b522fd0e05
commit 8a96854733
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
spec/util_xtemplate_spec.lua
View file

@ -38,6 +38,10 @@ describe("util.xtemplate", function ()
x:reset();
assert.same("12345", xtemplate.render("{foo/bar|each(i){{#}}}", x));
end)
it("handles missing inputs", function ()
local x = st.stanza("root");
assert.same("", xtemplate.render("{foo/bar|each(i){{#}}}", x));
end)
end)
end)
end)

5
teal-src/prosody/util/xtemplate.tl
View file

@ -54,7 +54,10 @@ local function render(template : string, root : st.stanza_t, escape : escape_t,
if tmpl then tmpl = s_sub(tmpl, 2, -2); end
if args then args = s_sub(args, 2, -2); end
if func == "each" and tmpl and st.is_stanza(value) then
if func == "each" and tmpl then
if not st.is_stanza(value) then
return pre_blank..post_blank;
end
if not args then value, args = root, path; end
local ns, name = s_match(args, "^(%b{})(.*)$");
if ns then ns = s_sub(ns, 2, -2); else name, ns = args, nil; end

3
util/xtemplate.lua
View file

@ -39,7 +39,8 @@ local function render(template, root, escape, filters)
if tmpl then tmpl = s_sub(tmpl, 2, -2); end
if args then args = s_sub(args, 2, -2); end
if func == "each" and tmpl and st.is_stanza(value) then
if func == "each" and tmpl then
if not st.is_stanza(value) then return pre_blank .. post_blank end
if not args then value, args = root, path; end
local ns, name = s_match(args, "^(%b{})(.*)$");
if ns then