Commit 75b49dff authored by Laurent Lécluse's avatar Laurent Lécluse
Browse files

Merge branches 'develop' and 'master' of https://git.unicaen.fr/lib/unicaen/app

parents cfe1cd6f ed829f91
Pipeline #5946 failed with stage
in 10 seconds
......@@ -74,6 +74,8 @@ class FormControlGroup extends AbstractHelper
return $this;
}
$this->helpContent = ['before' => '', 'after' => ''];
return $this->render($element, $pluginClass);
}
......
......@@ -116,7 +116,7 @@ abstract class AbstractMapper
if (!$attributes) {
$attributes = $this->getAttributes() ?: ['*'];
}
$entries = $this->getLdap()->searchEntries($filter, $baseDn, $scope, $attributes, $sort);
$entries = @$this->getLdap()->searchEntries($filter, $baseDn, $scope, $attributes, $sort);
if (count($entries) > 1) {
throw new RuntimeException("Plus d'une entrée trouvée avec ce filtre: " . $filter);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment