diff --git a/rhodecode/lib/celerylib/tasks.py b/rhodecode/lib/celerylib/tasks.py --- a/rhodecode/lib/celerylib/tasks.py +++ b/rhodecode/lib/celerylib/tasks.py @@ -251,7 +251,7 @@ def send_password_link(user_email): log = get_logger(send_password_link) DBS = get_session() - + try: user = User.get_by_email(user_email) if user: @@ -281,7 +281,7 @@ def reset_user_password(user_email): log = get_logger(reset_user_password) DBS = get_session() - + try: try: user = User.get_by_email(user_email) @@ -325,7 +325,7 @@ def send_email(recipients, subject, body """ log = get_logger(send_email) DBS = get_session() - + email_config = config subject = "%s %s" % (email_config.get('email_prefix'), subject) if not recipients: diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py --- a/rhodecode/lib/helpers.py +++ b/rhodecode/lib/helpers.py @@ -774,7 +774,7 @@ def urlify_commit(text_, repository=None # urlify changesets text_ = urlify_changesets(text_, repository) - + def linkify_others(t,l): urls = re.compile(r'(\)',) links = [] @@ -782,8 +782,8 @@ def urlify_commit(text_, repository=None if not urls.match(e): links.append('%s' % (l,e)) else: - links.append(e) - + links.append(e) + return ''.join(links) try: conf = config['app_conf'] @@ -817,12 +817,12 @@ def urlify_commit(text_, repository=None 'issue-prefix': ISSUE_PREFIX, 'serv': ISSUE_SERVER_LNK, } - + newtext = URL_PAT.sub(url_func, text_) - + # wrap not links into final link => link_ newtext = linkify_others(newtext, link_) - + return literal(newtext) except: log.error(traceback.format_exc()) diff --git a/rhodecode/templates/base/base.html b/rhodecode/templates/base/base.html --- a/rhodecode/templates/base/base.html +++ b/rhodecode/templates/base/base.html @@ -85,7 +85,7 @@
${h.text('username',class_='focus',size=40)}
- +
@@ -94,7 +94,7 @@
${h.password('password',class_='focus',size=40)}
- +
${h.link_to(_('Forgot password ?'),h.url('reset_password'))}
@@ -124,7 +124,7 @@
%endif -
+