remove unneeded empty search attribute values, fixes #12086
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
This commit is contained in:
parent
061846c7d0
commit
c4df29afb0
|
@ -197,6 +197,13 @@ class Manager {
|
|||
);
|
||||
}
|
||||
|
||||
// remove possible empty attributes
|
||||
$attributes = array_values(
|
||||
array_filter($attributes, function ($attributeName) {
|
||||
return !empty($attributeName);
|
||||
})
|
||||
);
|
||||
|
||||
return $attributes;
|
||||
}
|
||||
|
||||
|
|
|
@ -256,12 +256,17 @@ class ManagerTest extends \Test\TestCase {
|
|||
$manager->setLdapAccess($access);
|
||||
|
||||
$connection = $access->getConnection();
|
||||
$connection->setConfiguration(['ldapEmailAttribute' => 'mail', 'ldapUserAvatarRule' => 'default']);
|
||||
$connection->setConfiguration([
|
||||
'ldapEmailAttribute' => 'mail',
|
||||
'ldapUserAvatarRule' => 'default',
|
||||
'ldapQuotaAttribute' => '',
|
||||
]);
|
||||
|
||||
$attributes = $manager->getAttributes($minimal);
|
||||
|
||||
$this->assertTrue(in_array('dn', $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('thumbnailphoto', $attributes));
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue