From aa4e1522968b19499801fe3d73d6b2f3bf3b3acd Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Sun, 8 Jan 2012 09:51:36 +0000 Subject: Fixed #12183 -- Made the urlize filter insert the nofollow attribute properly when an http: URL occurs after a mailto: URL. Thanks eronen for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17356 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/utils/html.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'django/utils') diff --git a/django/utils/html.py b/django/utils/html.py index ce886efba7..a0ad5f3d00 100644 --- a/django/utils/html.py +++ b/django/utils/html.py @@ -141,7 +141,6 @@ def urlize(text, trim_url_limit=None, nofollow=False, autoescape=False): trim_url = lambda x, limit=trim_url_limit: limit is not None and (len(x) > limit and ('%s...' % x[:max(0, limit - 3)])) or x safe_input = isinstance(text, SafeData) words = word_split_re.split(force_unicode(text)) - nofollow_attr = nofollow and ' rel="nofollow"' or '' for i, word in enumerate(words): match = None if '.' in word or '@' in word or ':' in word: @@ -150,6 +149,7 @@ def urlize(text, trim_url_limit=None, nofollow=False, autoescape=False): lead, middle, trail = match.groups() # Make URL we want to point to. url = None + nofollow_attr = ' rel="nofollow"' if nofollow else '' if middle.startswith('http://') or middle.startswith('https://'): url = smart_urlquote(middle) elif middle.startswith('www.') or ('@' not in middle and \ -- cgit v1.3