# HG changeset patch # User Marcin Kuzminski # Date 1361821732 -3600 # Node ID 5ff79fad209cc64c077fd1caf5fcf9471426dc84 # Parent 1ca82b6a63491f9d5ba3a71104efcc0f2ee4cfcc don't use double literal() calls on urlify functions diff -r 1ca82b6a6349 -r 5ff79fad209c rhodecode/lib/helpers.py --- a/rhodecode/lib/helpers.py Mon Feb 25 17:55:18 2013 +0100 +++ b/rhodecode/lib/helpers.py Mon Feb 25 20:48:52 2013 +0100 @@ -977,7 +977,7 @@ return literal('
%s%s
' % (width, d_a, d_d)) -def urlify_text(text_): +def urlify_text(text_, safe=True): """ Extrac urls from text and make html links out of them @@ -990,8 +990,10 @@ def url_func(match_obj): url_full = match_obj.groups()[0] return '%(url)s' % ({'url': url_full}) - - return literal(url_pat.sub(url_func, text_)) + _newtext = url_pat.sub(url_func, text_) + if safe: + return literal(_newtext) + return _newtext def urlify_changesets(text_, repository): @@ -1062,7 +1064,7 @@ newtext = urlify_changesets(escaper(text_), repository) # extract http/https links and make them real urls - newtext = urlify_text(newtext) + newtext = urlify_text(newtext, safe=False) try: from rhodecode import CONFIG