Commit bf5cc2d5 authored by jplang's avatar jplang

Link to user in wiki syntax only works when login is written in lower case (#26892).

Patch by Marius BALTEANU and Go MAEDA.

git-svn-id: https://svn.redmine.org/redmine/trunk@17516 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 8c781892
......@@ -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_\-@\.]*)
)
)
(?=
......
......@@ -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)),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment