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
a7dd6a3d
Unverified
Commit
a7dd6a3d
authored
3 years ago
by
Côme Chilliet
Browse files
Options
Download
Patches
Plain Diff
fix(setup) Fix PHPCompatibility warning in web setup
issue
#6167
parent
eaccdfb7
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
6379-core-ogroups-creation-with-backend-default-user-available-for-selection
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
setup/class_setupStepMigrate.inc
+4
-4
setup/class_setupStepMigrate.inc
with
4 additions
and
4 deletions
+4
-4
setup/class_setupStepMigrate.inc
+
4
−
4
View file @
a7dd6a3d
...
...
@@ -1116,8 +1116,8 @@ class setupStepMigrate extends setupStep
/* Build groupid depending on base and objectClasses */
$groupid
=
md5
(
$base
.
implode
(
''
,
$attrs
[
'objectClass'
]));
if
(
!
isset
(
$this
->
$var
[
$groupid
]))
{
$this
->
$var
[
$groupid
]
=
[
if
(
!
isset
(
$this
->
{
$var
}
[
$groupid
]))
{
$this
->
{
$var
}
[
$groupid
]
=
[
'checked'
=>
FALSE
,
'objects'
=>
[],
'base'
=>
$base
,
...
...
@@ -1126,7 +1126,7 @@ class setupStepMigrate extends setupStep
}
$attrs
[
'ldif'
]
=
''
;
$this
->
$var
[
$groupid
][
'objects'
][
base64_encode
(
$attrs
[
'dn'
])]
=
$attrs
;
$this
->
{
$var
}
[
$groupid
][
'objects'
][
base64_encode
(
$attrs
[
'dn'
])]
=
$attrs
;
if
(
++
$count
>=
static
::
$objectNumberLimit
)
{
$sizeLimitHit
=
TRUE
;
break
2
;
...
...
@@ -1472,7 +1472,7 @@ class setupStepMigrate extends setupStep
foreach
(
$tmp
as
$value
=>
$dns
)
{
if
(
count
(
$dns
)
>
1
)
{
foreach
(
$dns
as
$dn
)
{
$this
->
$duplicates
[
$dn
]
=
$value
;
$this
->
{
$duplicates
}
[
$dn
]
=
$value
;
}
}
}
...
...
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