mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove arbitrary expression in empty 

Those are only allowed in PHP 5.5, thus making our code incompatible with PHP 5.4

Fixes https://github.com/owncloud/core/issues/19793
This commit is contained in:
Lukas Reschke 2015-10-14 22:35:46 +02:00
parent 905474ebd4
commit 4e5eb3b828
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/user_ldap/lib/configuration.php
View File

@ -150,8 +150,9 @@ class Configuration {
$setMethod = 'setRawValue'; $setMethod = 'setRawValue';
break; break;
case 'homeFolderNamingRule': case 'homeFolderNamingRule':
if(!empty(trim($val)) && strpos($val, 'attr:') === false) { $trimmedVal = trim($val);
$val = 'attr:'.trim($val); if(!empty($trimmedVal) && strpos($val, 'attr:') === false) {
$val = 'attr:'.$trimmedVal;
} }
break; break;
case 'ldapBase': case 'ldapBase':