diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-01-21 04:41:49 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-01-21 04:41:49 +0000 |
| commit | 1adeee686eaf905227ae3457420a68d2e7865fdb (patch) | |
| tree | 23c06384f14d0391fa59cdba4546ff8d4a352c2d /app/models | |
| parent | 46310f32c5cc92aa167aaac2e0a077861be1ab5a (diff) | |
| download | redmine-1adeee686eaf905227ae3457420a68d2e7865fdb.tar.gz redmine-1adeee686eaf905227ae3457420a68d2e7865fdb.zip | |
Merged r15024 and r15025 (#21453).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15075 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/auth_source_ldap.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/auth_source_ldap.rb b/app/models/auth_source_ldap.rb index d5a8550c7..b18b657b0 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 |