Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
lib
unicaen
app
Commits
75b49dff
Commit
75b49dff
authored
Dec 05, 2019
by
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
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
src/UnicaenApp/Form/View/Helper/FormControlGroup.php
View file @
75b49dff
...
...
@@ -74,6 +74,8 @@ class FormControlGroup extends AbstractHelper
return
$this
;
}
$this
->
helpContent
=
[
'before'
=>
''
,
'after'
=>
''
];
return
$this
->
render
(
$element
,
$pluginClass
);
}
...
...
src/UnicaenApp/Mapper/Ldap/AbstractMapper.php
View file @
75b49dff
...
...
@@ -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
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment