Fixed #488 -- removetags template filter now removes tags without a space before the final slash
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1018 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
c6f375fd11
commit
b5a6ff5bdd
|
@ -175,7 +175,7 @@ def removetags(value, tags):
|
||||||
"Removes a space separated list of [X]HTML tags from the output"
|
"Removes a space separated list of [X]HTML tags from the output"
|
||||||
tags = [re.escape(tag) for tag in tags.split()]
|
tags = [re.escape(tag) for tag in tags.split()]
|
||||||
tags_re = '(%s)' % '|'.join(tags)
|
tags_re = '(%s)' % '|'.join(tags)
|
||||||
starttag_re = re.compile('<%s(>|(\s+[^>]*>))' % tags_re)
|
starttag_re = re.compile(r'<%s(/?>|(\s+[^>]*>))' % tags_re)
|
||||||
endtag_re = re.compile('</%s>' % tags_re)
|
endtag_re = re.compile('</%s>' % tags_re)
|
||||||
value = starttag_re.sub('', value)
|
value = starttag_re.sub('', value)
|
||||||
value = endtag_re.sub('', value)
|
value = endtag_re.sub('', value)
|
||||||
|
|
Loading…
Reference in New Issue