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
42659793
Unverified
Commit
42659793
authored
5 years ago
by
Côme Chilliet
Browse files
Options
Download
Patches
Plain Diff
fix(config) Avoid using count on non-existing var
issue
#6026
parent
476e80dc
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
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
include/class_config.inc
+1
-8
include/class_config.inc
with
1 addition
and
8 deletions
+1
-8
include/class_config.inc
+
1
−
8
View file @
42659793
...
...
@@ -800,13 +800,6 @@ class config
/* Walk through array */
ksort
(
$arr
);
foreach
(
$arr
as
$name
=>
$entries
)
{
/* If this department is the last in the current tree position
* remove it, to avoid generating output for it */
if
(
count
(
$entries
[
'SUB'
])
==
0
)
{
unset
(
$entries
[
'SUB'
]);
}
/* Fix name, if it contains a replace tag */
$name
=
preg_replace
(
'/\\\\,/'
,
','
,
$name
);
...
...
@@ -825,7 +818,7 @@ class config
}
/* recursive add of subdepartments */
if
(
isset
(
$entries
[
'SUB'
]))
{
if
(
!
empty
(
$entries
[
'SUB'
]))
{
$ret
=
array_merge
(
$ret
,
$this
->
generateDepartmentArray
(
$entries
[
'SUB'
],
$depth
,
$max_size
));
}
}
...
...
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