diff options
| -rw-r--r-- | app/helpers/application_helper.rb | 6 | ||||
| -rw-r--r-- | test/helpers/application_helper_test.rb | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 419287533..62987ca29 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1025,12 +1025,12 @@ module ApplicationHelper link = link_to_project(p, {:only_path => only_path}, :class => 'project') end when 'user' - u = User.visible.where(:login => name, :type => 'User').first + u = User.visible.where("LOWER(login) = :s AND type = 'User'", :s => name.downcase).first link = link_to_user(u, :only_path => only_path) if u end elsif sep == "@" name = remove_double_quotes(identifier) - u = User.visible.where(:login => name, :type => 'User').first + u = User.visible.where("LOWER(login) = :s AND type = 'User'", :s => name.downcase).first link = link_to_user(u, :only_path => only_path) if u end end @@ -1067,7 +1067,7 @@ module ApplicationHelper )| ( (?<sep4>@) - (?<identifier3>[a-z0-9_\-@\.]*) + (?<identifier3>[A-Za-z0-9_\-@\.]*) ) ) (?= diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb index fd0886c80..d4990d39f 100644 --- a/test/helpers/application_helper_test.rb +++ b/test/helpers/application_helper_test.rb @@ -403,8 +403,10 @@ RAW "http://foo.bar/FAQ#3" => '<a class="external" href="http://foo.bar/FAQ#3">http://foo.bar/FAQ#3</a>', # user 'user:jsmith' => link_to_user(User.find_by_id(2)), + '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)), '@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)), '@foo.bar@example.com' => link_to_user(User.find_by_id(u_email_id_2)), |