jro_apps/redmine Commit - r1545:d991e46f122d

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

Jean-Philippe Lang -

r1545:d991e46f122d

parent child

Context file:

r1545:d991e46f122d

lib/redmine/wiki_formatting.rb +6 -2

                   # 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
+                      mail = $1
-                      %{<a href="mailto:#{$1}" class="email">#{text}</a>}
+                      if text.match(/<a\b[^>]*>(.*)(#{Regexp.escape(mail)})(.*)<\/a>/)
+                        mail
+                      else
+                        %{<a href="mailto:#{mail}" class="email">#{mail}</a>}
+                      end
                     end
                   end
                 end

test/unit/helpers/application_helper_test.rb +2 -1

                   'http://foo.bar/foo.bar#foo.bar.' => '<a class="external" href="http://foo.bar/foo.bar#foo.bar">http://foo.bar/foo.bar#foo.bar</a>.',
                   'www.foo.bar' => '<a class="external" href="http://www.foo.bar">www.foo.bar</a>',
                   'http://foo.bar/page?p=1&t=z&s=' => '<a class="external" href="http://foo.bar/page?p=1&#38;t=z&#38;s=">http://foo.bar/page?p=1&#38;t=z&#38;s=</a>',
-                  'http://foo.bar/page#125' => '<a class="external" href="http://foo.bar/page#125">http://foo.bar/page#125</a>'
+                  'http://foo.bar/page#125' => '<a class="external" href="http://foo.bar/page#125">http://foo.bar/page#125</a>',
+                  'http://foo@www.bar.com' => '<a class="external" href="http://foo@www.bar.com">http://foo@www.bar.com</a>',
                 }
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               end

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages