kallithea Changeset - f486d1d27025

Changeset - f486d1d27025

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 9 years ago 2016-09-06 00:51:18
madski@unity3d.com

helpers: move linkify_others out of urlify_issues - it is almost always relevant

1 file changed with 5 insertions and 6 deletions:

kallithea/lib/helpers.py

0 comments (0 inline, 0 general)

kallithea/lib/helpers.py

➞

Show inline comments

@@ @@ -1321,7 +1321,10 @@ def urlify_text(s, repo_name=None, link_ @@
     s = html_escape(s)
     s = _urlify(s)
     if repo_name is not None:
         s = urlify_issues(s, repo_name, link_)
         s = urlify_issues(s, repo_name)
     if link_ is not None:
         # make href around everything that isn't a href already
         s = linkify_others(s, link_)
     s = s.replace('\r\n', '<br/>').replace('\n', '<br/>')
     return literal(s)
@@ @@ -1368,7 +1371,7 @@ def _urlify_issues_replace_f(repo_name, @@
     return urlify_issues_replace
-def urlify_issues(newtext, repo_name, link_=None):
 def urlify_issues(newtext, repo_name):
     from kallithea import CONFIG as conf
     # allow multiple issue servers to be used
@@ @@ -1398,10 +1401,6 @@ def urlify_issues(newtext, repo_name, li @@
         newtext = URL_PAT.sub(urlify_issues_replace, newtext)
         log.debug('processed prefix:`%s` => %s', pattern_index, newtext)
     # if we actually did something above
     if link_:
         # wrap not links into final link => link_
         newtext = linkify_others(newtext, link_)
     return newtext

0 comments (0 inline, 0 general)