summaryrefslogtreecommitdiffstats
path: root/apps/user_ldap/lib/configuration.php
diff options
context:
space:
mode:
Diffstat (limited to 'apps/user_ldap/lib/configuration.php')
-rw-r--r--apps/user_ldap/lib/configuration.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/user_ldap/lib/configuration.php b/apps/user_ldap/lib/configuration.php
index c8bf1c09482..e14ed824a74 100644
--- a/apps/user_ldap/lib/configuration.php
+++ b/apps/user_ldap/lib/configuration.php
@@ -241,7 +241,7 @@ class Configuration {
protected function setMultiLine($varname, $value) {
if(empty($value)) {
$value = '';
- } else {
+ } else if (!is_array($value)) {
$value = preg_split('/\r\n|\r|\n/', $value);
if($value === false) {
$value = '';
@@ -374,7 +374,7 @@ class Configuration {
'ldap_attributes_for_user_search' => 'ldapAttributesForUserSearch',
'ldap_attributes_for_group_search' => 'ldapAttributesForGroupSearch',
'ldap_expert_username_attr' => 'ldapExpertUsernameAttr',
- 'ldap_expert_uuid_user_attr' => 'ldapExpertUUIUserDAttr',
+ 'ldap_expert_uuid_user_attr' => 'ldapExpertUUIDUserAttr',
'ldap_expert_uuid_group_attr' => 'ldapExpertUUIDGroupAttr',
'has_memberof_filter_support' => 'hasMemberOfFilterSupport',
);