From d7504a3d7b8645bdb979bab7ded0e9a9b6dccd0e Mon Sep 17 00:00:00 2001
From: Claude Paroz <claude@2xlibre.net>
Date: Wed, 6 Feb 2013 21:20:43 +0100
Subject: [PATCH] Improved regex in strip_tags

Thanks Pablo Recio for the report. Refs #19237.
---
 django/utils/html.py                | 2 +-
 tests/regressiontests/utils/html.py | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/django/utils/html.py b/django/utils/html.py
index ec7b28d330a6..a9ebd1793551 100644
--- a/django/utils/html.py
+++ b/django/utils/html.py
@@ -33,7 +33,7 @@
 html_gunk_re = re.compile(r'(?:<br clear="all">|<i><\/i>|<b><\/b>|<em><\/em>|<strong><\/strong>|<\/?smallcaps>|<\/?uppercase>)', re.IGNORECASE)
 hard_coded_bullets_re = re.compile(r'((?:<p>(?:%s).*?[a-zA-Z].*?</p>\s*)+)' % '|'.join([re.escape(x) for x in DOTS]), re.DOTALL)
 trailing_empty_content_re = re.compile(r'(?:<p>(?:&nbsp;|\s|<br \/>)*?</p>\s*)+\Z')
-strip_tags_re = re.compile(r'</?\S([^=]*=(\s*"[^"]*"|\s*\'[^\']*\'|\S*)|[^>])*?>', re.IGNORECASE)
+strip_tags_re = re.compile(r'</?\S([^=>]*=(\s*"[^"]*"|\s*\'[^\']*\'|\S*)|[^>])*?>', re.IGNORECASE)
 
 
 def escape(text):
diff --git a/tests/regressiontests/utils/html.py b/tests/regressiontests/utils/html.py
index a0226c47657f..62c7dac24a5b 100644
--- a/tests/regressiontests/utils/html.py
+++ b/tests/regressiontests/utils/html.py
@@ -68,6 +68,7 @@ def test_strip_tags(self):
             ('a<p onclick="alert(\'<test>\')">b</p>c', 'abc'),
             ('a<p a >b</p>c', 'abc'),
             ('d<a:b c:d>e</p>f', 'def'),
+            ('<strong>foo</strong><a href="http://example.com">bar</a>', 'foobar'),
         )
         for value, output in items:
             self.check_output(f, value, output)