summaryrefslogtreecommitdiffstats
path: root/lib/redmine/wiki_formatting.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2013-02-24 12:39:06 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2013-02-24 12:39:06 +0000
commitdfca67d844ca10498e1e4e4834117bc390696d46 (patch)
treee2229dc8b7a5f0555fa09c2ca3f98f1d5fe6102b /lib/redmine/wiki_formatting.rb
parent458800c1d5755e068210259adf42de1d3c373f90 (diff)
downloadredmine-dfca67d844ca10498e1e4e4834117bc390696d46.tar.gz
redmine-dfca67d844ca10498e1e4e4834117bc390696d46.zip
Fixed that www followed by a dot generates broken links in formatted text (#3676).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11473 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine/wiki_formatting.rb')
-rw-r--r--lib/redmine/wiki_formatting.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/redmine/wiki_formatting.rb b/lib/redmine/wiki_formatting.rb
index 312f6c48c..2a3023a09 100644
--- a/lib/redmine/wiki_formatting.rb
+++ b/lib/redmine/wiki_formatting.rb
@@ -95,7 +95,7 @@ module Redmine
(?:www\.) # www.*
)
(
- (\S+?) # url
+ ([^<]\S*?) # url
(\/)? # slash
)
((?:&gt;)?|[^[:alnum:]_\=\/;\(\)]*?) # post