Skip to content

Commit

Permalink
Merge pull request #5923 from eduardoj/force_utf8_in_realname
Browse files Browse the repository at this point in the history
Force utf8 encoding when updating user realname
  • Loading branch information
hennevogel committed Sep 25, 2018
2 parents 45022ff + 9191af7 commit 1fd9618
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/api/app/models/user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ def update_user_info_from_proxy_env(env)
save
end
return unless env['HTTP_X_FIRSTNAME'].present? && env['HTTP_X_LASTNAME'].present?
realname = env['HTTP_X_FIRSTNAME'] + ' ' + env['HTTP_X_LASTNAME']
realname = env['HTTP_X_FIRSTNAME'].force_encoding('UTF-8') + ' ' + env['HTTP_X_LASTNAME'].force_encoding('UTF-8')
return unless self.realname != realname

self.realname = realname
Expand Down

0 comments on commit 1fd9618

Please sign in to comment.