From c12ba8a76cfa54b2f980017a1ca4a5d28bf8ce5d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 14 Nov 2014 20:18:09 +0000
Subject: Fixed that URLs separated by line break are not rendered as links
 (#18349).

git-svn-id: http://svn.redmine.org/redmine/trunk@13592 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/wiki_formatting.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/redmine/wiki_formatting.rb b/lib/redmine/wiki_formatting.rb
index 284cdc933..b1085a74a 100644
--- a/lib/redmine/wiki_formatting.rb
+++ b/lib/redmine/wiki_formatting.rb
@@ -94,7 +94,7 @@ module Redmine
     module LinksHelper
       AUTO_LINK_RE = %r{
                       (                          # leading text
-                        <\w+.*?>|                # leading HTML tag, or
+                        <\w+[^>]*?>|             # leading HTML tag, or
                         [\s\(\[,;]|              # leading punctuation, or
                         ^                        # beginning of line
                       )
@@ -113,8 +113,12 @@ module Redmine
 
       # Destructively replaces urls into clickable links
       def auto_link!(text)
+        Rails.logger.debug "====================="
+        Rails.logger.debug text
+        Rails.logger.debug "====================="
         text.gsub!(AUTO_LINK_RE) do
           all, leading, proto, url, post = $&, $1, $2, $3, $6
+          Rails.logger.debug all
           if leading =~ /<a\s/i || leading =~ /![<>=]?/
             # don't replace URLs that are already linked
             # and URLs prefixed with ! !> !< != (textile images)
-- 
cgit v1.2.3