Skip to content
GitLab
Unverified Commit 9117e72a authored by Côme Chilliet's avatar Côme Chilliet
Browse files

:ambulance: fix(simpleplugin) Improve empty Date handling 

issue #6152
parent 95ce0118
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 fusiondirectory-1.3.1
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 6 additions and 5 deletions
+6 -5
include/simpleplugin/attributes/class_DateAttribute.inc
+ 6
− 5
View file @ 9117e72a
......@@ -44,9 +44,10 @@ class DateAttribute extends Attribute
function inputValue ($value)
{
if ($value === "" && !$this->isRequired()) {
return $value;
} elseif ($this->isTemplate() && preg_match('/%/', $value)) {
if (
($value === '') ||
($this->isTemplate() && preg_match('/%/', $value))
) {
return $value;
} else {
return $this->ldapToDate($value);
......@@ -55,7 +56,7 @@ class DateAttribute extends Attribute
function getValue ()
{
if ($this->value === "" && !$this->isRequired()) {
if ($this->value === '') {
return $this->value;
} else {
try {
......@@ -97,7 +98,7 @@ class DateAttribute extends Attribute
function computeLdapValue ()
{
if ($this->value === "" && !$this->isRequired()) {
if ($this->value === '') {
return $this->value;
} elseif (!($this->value instanceof DateTime)) {
try {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment