From 1adeee686eaf905227ae3457420a68d2e7865fdb 2016-01-21 04:41:49 From: Jean-Philippe Lang Date: 2016-01-21 04:41:49 Subject: [PATCH] Merged r15024 and r15025 (#21453). git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15075 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/models/auth_source_ldap.rb b/app/models/auth_source_ldap.rb index d5a8550..b18b657 100644 --- a/app/models/auth_source_ldap.rb +++ b/app/models/auth_source_ldap.rb @@ -197,7 +197,8 @@ class AuthSourceLdap < AuthSource def self.get_attr(entry, attr_name) if !attr_name.blank? - entry[attr_name].is_a?(Array) ? entry[attr_name].first : entry[attr_name] + value = entry[attr_name].is_a?(Array) ? entry[attr_name].first : entry[attr_name] + value.to_s.force_encoding('UTF-8') end end end