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

Merge pull request #12123 from nextcloud/backport/12107/stable13 

[stable13] remove unneeded empty search attribute values, fixes #12086
This commit is contained in:
Roeland Jago Douma 2018-10-29 20:06:24 +01:00 committed by GitHub
parent 061846c7d0 c4df29afb0
commit 661062271f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/user_ldap/lib/User/Manager.php
View File

@ -197,6 +197,13 @@ class Manager {
); );
} }
// remove possible empty attributes
$attributes = array_values(
array_filter($attributes, function ($attributeName) {
return !empty($attributeName);
})
);
return $attributes; return $attributes;
} }

7
apps/user_ldap/tests/User/ManagerTest.php
View File

@ -256,12 +256,17 @@ class ManagerTest extends \Test\TestCase {
$manager->setLdapAccess($access); $manager->setLdapAccess($access);
$connection = $access->getConnection(); $connection = $access->getConnection();
$connection->setConfiguration(['ldapEmailAttribute' => 'mail', 'ldapUserAvatarRule' => 'default']); $connection->setConfiguration([
'ldapEmailAttribute' => 'mail',
'ldapUserAvatarRule' => 'default',
'ldapQuotaAttribute' => '',
]);
$attributes = $manager->getAttributes($minimal); $attributes = $manager->getAttributes($minimal);
$this->assertTrue(in_array('dn', $attributes)); $this->assertTrue(in_array('dn', $attributes));
$this->assertTrue(in_array($access->getConnection()->ldapEmailAttribute, $attributes)); $this->assertTrue(in_array($access->getConnection()->ldapEmailAttribute, $attributes));
$this->assertFalse(in_array('', $attributes));
$this->assertSame(!$minimal, in_array('jpegphoto', $attributes)); $this->assertSame(!$minimal, in_array('jpegphoto', $attributes));
$this->assertSame(!$minimal, in_array('thumbnailphoto', $attributes)); $this->assertSame(!$minimal, in_array('thumbnailphoto', $attributes));
} }