Merged r20936 from trunk to 4.1-stable (#34894).

git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@20943 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b5eb707aa611bdf97e4f5cc3ed8496575f00fbc7..8b5d48c85406f2c0a5236dfb8424ed2ed1df1ac3 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1190,7 +1190,7 @@ module ApplicationHelper
               )|
               (
               (?<sep4>@)
-              (?<identifier3>[A-Za-z0-9_\-@\.]*)
+              (?<identifier3>[A-Za-z0-9_\-@\.]*?)
               )
             )
             (?=

diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb
index 3fc1f90ade2837d347e50e51c9beeb49cc6157ae..2514e07219f6d5fa58d1eaeb61b4b6a9ded5acfb 100644 (file)
--- a/test/helpers/application_helper_test.rb
+++ b/test/helpers/application_helper_test.rb
@@ -456,6 +456,7 @@ class ApplicationHelperTest < Redmine::HelperTest
       'user:JSMITH'                 => link_to_user(User.find_by_id(2)),
       'user#2'                      => link_to_user(User.find_by_id(2)),
       '@jsmith'                     => link_to_user(User.find_by_id(2)),
+      '@jsmith.'                    => "#{link_to_user(User.find_by_id(2))}.",
       '@JSMITH'                     => link_to_user(User.find_by_id(2)),
       '@abcd@example.com'           => link_to_user(User.find_by_id(u_email_id)),
       'user:abcd@example.com'       => link_to_user(User.find_by_id(u_email_id)),