summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@owncloud.com>2013-10-24 14:27:33 +0200
committerArthur Schiwon <blizzz@owncloud.com>2013-10-24 14:27:33 +0200
commit20f46602bdee9cbcb1bd2d4246973c423cc62b64 (patch)
tree3c4747251d797111264123d6dd41af1f5910c060 /apps
parent6284e95e2bf034ebbef231be8b1c2c2266946629 (diff)
downloadnextcloud-server-20f46602bdee9cbcb1bd2d4246973c423cc62b64.tar.gz
nextcloud-server-20f46602bdee9cbcb1bd2d4246973c423cc62b64.zip
LDAP: when multiline values are passed as array, do not try to preg_split them. Fixes #5521
Diffstat (limited to 'apps')
-rw-r--r--apps/user_ldap/lib/configuration.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/user_ldap/lib/configuration.php b/apps/user_ldap/lib/configuration.php
index e9de106bdd0..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 = '';