Fixed: urls containing @ are parsed as email adress by the wiki formatter (#1456).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1559 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 7 insertions, 3 deletions

diff --git a/lib/redmine/wiki_formatting.rb b/lib/redmine/wiki_formatting.rb
index 88a858b04..6c8eebbbc 100644
--- a/lib/redmine/wiki_formatting.rb
+++ b/lib/redmine/wiki_formatting.rb
@@ -152,12 +152,16 @@ module Redmine
           end
         end
       end
-      
+
       # Turns all email addresses into clickable links (code from Rails).
       def inline_auto_mailto(text)
         text.gsub!(/([\w\.!#\$%\-+.]+@[A-Za-z0-9\-]+(\.[A-Za-z0-9\-]+)+)/) do
-          text = $1
-          %{<a href="mailto:#{$1}" class="email">#{text}</a>}
+          mail = $1
+          if text.match(/<a\b[^>]*>(.*)(#{Regexp.escape(mail)})(.*)<\/a>/)
+            mail
+          else
+            %{<a href="mailto:#{mail}" class="email">#{mail}</a>}
+          end
         end
       end
     end