[Fix] Fix replacements to sanitize '%' character

Conflicts:
	src/plugins/lua/spamassassin.lua

diff --git a/src/plugins/lua/spamassassin.lua b/src/plugins/lua/spamassassin.lua
index 1019dd3933e61a0229f8057748ea09053afe7347..27940212a801ec9e2a428c04e8dfaf0e3f523eab 100644 (file)
--- a/src/plugins/lua/spamassassin.lua
+++ b/src/plugins/lua/spamassassin.lua
@@ -1068,14 +1068,15 @@ local function apply_replacements(str)
   end
 
   local function replace_all_tags(s)
-    local str, matches
-    str = s
+    local sstr
+    sstr = s
     each(function(n, t)
-        str,matches = string.gsub(str, string.format("<%s>", n),
-          string.format("%s%s%s", pre, t, post))
+      local rep = string.format("%s%s%s", pre, t, post)
+      rep = string.gsub(rep, '%%', '%%%%')
+      sstr = string.gsub(sstr, string.format("<%s>", n), rep)
     end, replace['tags'])
 
-    return str
+    return sstr
   end
 
   local s = replace_all_tags(str)