Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-09 23:15:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #143 from chris-vanvranken/master

Browse Source 
retrieve LDAP emails as lowercase to avoid confusion
This commit is contained in:
Naoki Takezoe
2013-10-15 10:28:05 -07:00
parent ba70fdda48 05adf9345f
commit cb12d03262
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/scala/view/AvatarImageProvider.scala
View File

@@ -15,13 +15,13 @@ trait AvatarImageProvider { self: RequestCache =>
val src = getAccountByUserName(userName).map { account => val src = getAccountByUserName(userName).map { account =>
if(account.image.isEmpty && getSystemSettings().gravatar){ if(account.image.isEmpty && getSystemSettings().gravatar){
s"""http://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress)}?s=${size}""" s"""http://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress.toLowerCase())}?s=${size}"""
} else { } else {
s"""${context.path}/${userName}/_avatar""" s"""${context.path}/${userName}/_avatar"""
} }
} getOrElse { } getOrElse {
if(mailAddress.nonEmpty && getSystemSettings().gravatar){ if(mailAddress.nonEmpty && getSystemSettings().gravatar){
s"""http://www.gravatar.com/avatar/${StringUtil.md5(mailAddress)}?s=${size}""" s"""http://www.gravatar.com/avatar/${StringUtil.md5(mailAddress.toLowerCase())}?s=${size}"""
} else { } else {
s"""${context.path}/${userName}/_avatar""" s"""${context.path}/${userName}/_avatar"""
} }