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 
Backport of 1f93e4f78c53
This commit is contained in:
Kim Alvefur 2024-07-11 15:24:19 +02:00
parent ca417ab776
commit bb278430cf
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -46,7 +46,10 @@ local function render(template : string, root : st.stanza_t, escape : escape_t,
if tmpl then tmpl = s_sub(tmpl, 2, -2); end if tmpl then tmpl = s_sub(tmpl, 2, -2); end
if args then args = s_sub(args, 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 "";
end
if not args then value, args = root, path; end if not args then value, args = root, path; end
local ns, name = s_match(args, "^(%b{})(.*)$"); local ns, name = s_match(args, "^(%b{})(.*)$");
if ns then ns = s_sub(ns, 2, -2); else name, ns = args, nil; end if ns then ns = s_sub(ns, 2, -2); else name, ns = args, nil; end

3
util/xtemplate.lua
View file

@ -31,7 +31,8 @@ local function render(template, root, escape, filters)
if tmpl then tmpl = s_sub(tmpl, 2, -2); end if tmpl then tmpl = s_sub(tmpl, 2, -2); end
if args then args = s_sub(args, 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 "" end
if not args then value, args = root, path; end if not args then value, args = root, path; end
local ns, name = s_match(args, "^(%b{})(.*)$"); local ns, name = s_match(args, "^(%b{})(.*)$");
if ns then if ns then