diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-15 16:42:32 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-15 16:42:32 +0200 |
| commit | f50f78dd9b57eb1ed631165f1e0d6ae1ee2d47c6 (patch) | |
| tree | 476e256bdf36eee04531f7837f5a475ef2c0cd6f /apps/user_ldap | |
| parent | 09d7230921dfbc40c37bd26fd32fdadfb6f8057e (diff) | |
| parent | 4e5eb3b828805ce82c7c2722522d0e9add70c173 (diff) | |
| download | nextcloud-server-f50f78dd9b57eb1ed631165f1e0d6ae1ee2d47c6.tar.gz nextcloud-server-f50f78dd9b57eb1ed631165f1e0d6ae1ee2d47c6.zip | |
Merge pull request #19795 from owncloud/fix-language-level-compat
Remove arbitrary expression in empty
Diffstat (limited to 'apps/user_ldap')
| -rw-r--r-- | apps/user_ldap/lib/configuration.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/user_ldap/lib/configuration.php b/apps/user_ldap/lib/configuration.php index 6e62f5730b9..4a6263de9aa 100644 --- a/apps/user_ldap/lib/configuration.php +++ b/apps/user_ldap/lib/configuration.php @@ -150,8 +150,9 @@ class Configuration { $setMethod = 'setRawValue'; break; case 'homeFolderNamingRule': - if(!empty(trim($val)) && strpos($val, 'attr:') === false) { - $val = 'attr:'.trim($val); + $trimmedVal = trim($val); + if(!empty($trimmedVal) && strpos($val, 'attr:') === false) { + $val = 'attr:'.$trimmedVal; } break; case 'ldapBase': |