Commit bf12c663 authored by Andrew Godwin's avatar Andrew Godwin
Browse files

Merge pull request #289 from mjtamlyn/slugify-real-function

Fixed bug in 212b9826 -- Removed duplicate code in removetags
parents 5b09fc8a e4984812
Loading
Loading
Loading
Loading
+2 −7
Original line number Diff line number Diff line
@@ -468,13 +468,8 @@ def safeseq(value):
@stringfilter
def removetags(value, tags):
    """Removes a space separated list of [X]HTML tags from the output."""
    tags = [re.escape(tag) for tag in tags.split()]
    tags_re = '(%s)' % '|'.join(tags)
    starttag_re = re.compile(r'<%s(/?>|(\s+[^>]*>))' % tags_re, re.U)
    endtag_re = re.compile('</%s>' % tags_re)
    value = starttag_re.sub('', value)
    value = endtag_re.sub('', value)
    return value
    from django.utils.html import remove_tags
    return remove_tags(value, tags)

@register.filter(is_safe=True)
@stringfilter