Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
fusiondirectory
fusiondirectory
Commits
5cb82a85
Unverified
Commit
5cb82a85
authored
5 years ago
by
Côme Chilliet
Browse files
Options
Download
Patches
Plain Diff
fix(template) Fix fatal error when template has no asked fields
issue #6076
parent
a8688870
dev
6342-update-the-locales-for-1-5
6344-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen
6365-core-locking-mechanism-is-not-changing-the-mail-ressource-it-does-lock-the-mail-account
6365-core-when-lock-mechanism-is-trigger-the-user-should-not-be-editable-if-not-unlock
6378-orcid-test-method-is-wrong-and-break-orcid-saving
core-php8
master
fusiondirectory-1.5
fusiondirectory-1.4
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/class_template.inc
+1
-1
include/class_template.inc
include/simpleplugin/class_simpleTabs.inc
+1
-1
include/simpleplugin/class_simpleTabs.inc
with
2 additions
and
2 deletions
+2
-2
include/class_template.inc
+
1
−
1
View file @
5cb82a85
...
@@ -352,7 +352,7 @@ class template
...
@@ -352,7 +352,7 @@ class template
$specialAttrs
[
'caller'
.
strtoupper
(
$attr
)]
=
$ui
->
$attr
;
$specialAttrs
[
'caller'
.
strtoupper
(
$attr
)]
=
$ui
->
$attr
;
}
}
$this
->
attrs
=
templateHandling
::
parseArray
(
$this
->
attrs
,
$specialAttrs
,
$targetdn
);
$this
->
attrs
=
templateHandling
::
parseArray
(
$this
->
attrs
,
$specialAttrs
,
$targetdn
);
$this
->
tabObject
->
adapt_from_template
(
$this
->
attrs
,
array_merge
(
...
array_values
(
$this
->
attributes
)));
$this
->
tabObject
->
adapt_from_template
(
$this
->
attrs
,
array_merge
(
[],
...
array_values
(
$this
->
attributes
)));
$this
->
applied
=
TRUE
;
$this
->
applied
=
TRUE
;
return
$this
->
tabObject
;
return
$this
->
tabObject
;
...
...
This diff is collapsed.
Click to expand it.
include/simpleplugin/class_simpleTabs.inc
+
1
−
1
View file @
5cb82a85
...
@@ -457,7 +457,7 @@ class simpleTabs
...
@@ -457,7 +457,7 @@ class simpleTabs
* \param array $attrs an LDAP-like values array
* \param array $attrs an LDAP-like values array
* \param array $skip Attributes to skip
* \param array $skip Attributes to skip
*/
*/
function
adapt_from_template
(
$attrs
,
$skip
=
[])
function
adapt_from_template
(
array
$attrs
,
array
$skip
=
[])
{
{
foreach
(
$this
->
by_object
as
$key
=>
&
$obj
)
{
foreach
(
$this
->
by_object
as
$key
=>
&
$obj
)
{
logging
::
debug
(
DEBUG_TRACE
,
__LINE__
,
__FUNCTION__
,
__FILE__
,
$key
,
"Adapting"
);
logging
::
debug
(
DEBUG_TRACE
,
__LINE__
,
__FUNCTION__
,
__FILE__
,
$key
,
"Adapting"
);
...
...
This diff is collapsed.
Click to expand it.
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!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets