Don't encode already encoded entities

This commit is contained in:
Alex Iribarren 2021-03-12 19:06:12 +01:00 committed by Tomas Kopecek
parent 1c7f83acf6
commit 41d5414245
2 changed files with 4 additions and 7 deletions

View file

@ -106,12 +106,7 @@ class DecodeUTF8(Cheetah.Filters.Filter):
class XHTMLFilter(DecodeUTF8):
def filter(self, *args, **kw):
result = super(XHTMLFilter, self).filter(*args, **kw)
result = result.replace('&', '&')
result = result.replace('&', '&')
result = result.replace(' ', ' ')
result = result.replace('<', '<')
result = result.replace('>', '>')
return result
return re.sub(r'&(?![a-zA-Z0-9#]+;)', '&', result)
TEMPLATES = {}
@ -600,7 +595,7 @@ def escapeHTML(value):
return value
value = koji.fixEncoding(value)
return value.replace('&', '&').\
return re.sub(r'&(?![a-zA-Z0-9#]+;)', '&', value).\
replace('<', '&lt;').\
replace('>', '&gt;').\
replace('"', '&quot;').\