summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2021-04-23 03:05:19 +0000
committerGo MAEDA <maeda@farend.jp>2021-04-23 03:05:19 +0000
commitf71e316e501db1969873a18ebf22c1013fc8162d (patch)
tree91bd2bdab1e75fdfba2936c6476db877b9c73c23
parent45461bfe51e9492d607f7204120f49ce3396a0cf (diff)
downloadredmine-f71e316e501db1969873a18ebf22c1013fc8162d.tar.gz
redmine-f71e316e501db1969873a18ebf22c1013fc8162d.zip
Merged r20966 from trunk to 4.2-stable (#35135).
git-svn-id: http://svn.redmine.org/redmine/branches/4.2-stable@20967 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/models/auth_source_ldap.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/auth_source_ldap.rb b/app/models/auth_source_ldap.rb
index 623359531..8ed7ce27f 100644
--- a/app/models/auth_source_ldap.rb
+++ b/app/models/auth_source_ldap.rb
@@ -247,7 +247,7 @@ class AuthSourceLdap < AuthSource
def get_attr(entry, attr_name)
if !attr_name.blank?
value = entry[attr_name].is_a?(Array) ? entry[attr_name].first : entry[attr_name]
- value.to_s.force_encoding('UTF-8')
+ (+value.to_s).force_encoding('UTF-8')
end
end
end