fix(datefield, datetimefield): comparison against empty string

pluginsGLPI · Jun 16, 2023 · be4831c · be4831c
1 parent ce07899
commit be4831c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/inc/field/datefield.class.php b/inc/field/datefield.class.php
@@ -163,9 +163,15 @@ public function greaterThan($value): bool {
       } else {
          $answer = $this->value;
       }
+      if (empty($value)) {
+         $value = '0000-00-00';
+      }
       $answerDatetime = DateTime::createFromFormat(self::DATE_FORMAT, $answer);
       $answerDatetime->setTime(0, 0, 0, 0);
       $compareDatetime = DateTime::createFromFormat(self::DATE_FORMAT, $value);
+      if ($compareDatetime === false) {
+         return true;
+      }
       $compareDatetime->setTime(0, 0, 0, 0);
       return $answerDatetime > $compareDatetime;
    }

diff --git a/inc/field/datetimefield.class.php b/inc/field/datetimefield.class.php
@@ -164,8 +164,14 @@ public function greaterThan($value): bool {
       } else {
          $answer = $this->value;
       }
+      if (empty($value)) {
+         $value = '0000-00-00';
+      }
       $answerDatetime = DateTime::createFromFormat(self::DATE_FORMAT, $answer);
       $compareDatetime = DateTime::createFromFormat(self::DATE_FORMAT, $value);
+      if ($compareDatetime === false) {
+         return true;
+      }
       return $answerDatetime > $compareDatetime;
    }