update

Author: jaredmauch

Mailman/HTMLFormatter.py

@@ -406,18 +406,26 @@ def ParseTags(self, template, replacements, lang=None):
         # Convert replacement keys to lowercase for case-insensitive matching
         replacements = {k.lower(): v for k, v in replacements.items()}
 
-        # Split on MM tags, case-insensitive
+        # Split on MM tags, case-insensitive, but preserve HTML entities
         parts = re.split('(</?[Mm][Mm]-[^>]*>)', text)
         i = 1
         while i < len(parts):
             tag = parts[i].lower()  # Convert to lowercase for matching
             if tag in replacements:
                 repl = replacements[tag]
                 if isinstance(repl, str):
-                    repl = repl.encode(charset, 'replace')
-                if isinstance(repl, bytes):
+                    # Don't encode HTML entities
+                    if '&' in repl:
+                        parts[i] = repl
+                    else:
+                        repl = repl.encode(charset, 'replace')
+                        repl = repl.decode(charset, 'replace')
+                        parts[i] = repl
+                elif isinstance(repl, bytes):
                     repl = repl.decode(charset, 'replace')
-                parts[i] = repl
+                    parts[i] = repl
+                else:
+                    parts[i] = str(repl)
             else:
                 parts[i] = ''
             i = i + 2