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-plugins
Commits
bfc8f665
Unverified
Commit
bfc8f665
authored
3 years ago
by
Côme Chilliet
Browse files
Options
Download
Patches
Plain Diff
fix(dhcp) Fix PHP error in dhcp plugin
issue
#6140
parent
bbe98151
dev
6231-give-the-ability-to-the-webservice-to-notice-if-an-attribute-is-monovalued-or-multivalued
6237-add-requiredattrs-array-to-the-webservice-informations
6245-adapt-the-ci-to-the-reorganisation-of-the-dev-tools-and-fixing-the-trigger-downstream-pipelines
6250-supann-configuration-backend-requires-account-life-cycle-section
6280-plugins-update-plugins-to-take-into-consideration-the-new-directory-of-core-structure
6310-tasks-reminder-error-in-the-schema-duplicate-attribute-id
6311-put-the-version-1-5-in-all-yaml-for-fusiondirectory-1-5
6322-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen-2
6332-zimbra-allows-update-of-data-for-unknown-domain-name-for-specific-individual-aliases
6337-webservice-issue-with-archiving-post-request-not-responding-but-successfully-archiving-user
6341-supann-extract-resources-states-sub-states-from-backend-configuration-to-their-own-objects
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
dhcp/admin/dhcp/class_DhcpSectionsAttribute.inc
+2
-1
dhcp/admin/dhcp/class_DhcpSectionsAttribute.inc
with
2 additions
and
1 deletion
+2
-1
dhcp/admin/dhcp/class_DhcpSectionsAttribute.inc
+
2
−
1
View file @
bfc8f665
...
...
@@ -97,9 +97,10 @@ class DhcpSectionsAttribute extends DialogOrderedArrayAttribute
];
}
}
else
{
$ip
=
$dhcpObject
->
getStatement
(
'fixed-address'
);
return
[
[
'html'
=>
$link
],
$dhcpObject
->
getStatement
(
'fixed-address'
),
((
$ip
===
NULL
)
?
''
:
$ip
),
preg_replace
(
'/^[^ ]+ /'
,
''
,
(
isset
(
$dhcpObject
->
dhcpHWAddress
)
?
$dhcpObject
->
dhcpHWAddress
:
''
)),
];
}
...
...
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