aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2021-01-25 21:26:45 +0100
committerKim Alvefur <zash@zash.se>2021-01-25 21:26:45 +0100
commit414c232247ed65376811937ee00da1d29c0353b4 (patch)
treefa6ae2ccf7868248d693da9c11b0ecaf15dc7614
parent7146762a6d73ed7a792d8c7d1100c304bcb2266e (diff)
parentacdd02670bff6f1db4aa49b086928a3e9714d3cd (diff)
downloadprosody-414c232247ed65376811937ee00da1d29c0353b4.tar.gz
prosody-414c232247ed65376811937ee00da1d29c0353b4.zip
Merge 0.11->trunk
-rw-r--r--util/interpolation.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/util/interpolation.lua b/util/interpolation.lua
index 808a45f2..acae901c 100644
--- a/util/interpolation.lua
+++ b/util/interpolation.lua
@@ -43,11 +43,11 @@ local function new_render(pat, escape, funcs)
end
end
if funcs then
- while value ~= nil and opt == '|' do
+ while opt == '|' do
local f;
f, raw, opt, e = s_match(block, "^([%a_][%w_.]*)(!?)(%p?)()", e);
f = funcs[f];
- if f then value = f(value); end
+ if value ~= nil and f then value = f(value); end
end
end
if opt == '#' or opt == '%' then