Security update for Core, with self-updated composer

[yaffs-website] / web / core / lib / Drupal / Core / Datetime / Element / Datelist.php

diff --git a/web/core/lib/Drupal/Core/Datetime/Element/Datelist.php b/web/core/lib/Drupal/Core/Datetime/Element/Datelist.php
index 59177e77e9b95e2ccd2abe30d32439ecc92339e2..6f110d395f828f3a0b6a57b8215f142e954cc69f 100644 (file)
--- a/web/core/lib/Drupal/Core/Datetime/Element/Datelist.php
+++ b/web/core/lib/Drupal/Core/Datetime/Element/Datelist.php
@@ -302,6 +302,8 @@ class Datelist extends DateElementBase {
   public static function validateDatelist(&$element, FormStateInterface $form_state, &$complete_form) {
     $input_exists = FALSE;
     $input = NestedArray::getValue($form_state->getValues(), $element['#parents'], $input_exists);
+    $title = static::getElementTitle($element, $complete_form);
+
     if ($input_exists) {
       $all_empty = static::checkEmptyInputs($input, $element['#date_part_order']);
 
@@ -311,10 +313,11 @@ class Datelist extends DateElementBase {
       }
       // If there's empty input and the field is required, set an error.
       elseif (empty($input['year']) && empty($input['month']) && empty($input['day']) && $element['#required']) {
-        $form_state->setError($element, t('The %field date is required.'));
+        $form_state->setError($element, t('The %field date is required.', ['%field' => $title]));
       }
       elseif (!empty($all_empty)) {
         foreach ($all_empty as $value) {
+          $form_state->setError($element, t('The %field date is incomplete.', ['%field' => $title]));
           $form_state->setError($element[$value], t('A value must be selected for %part.', ['%part' => $value]));
         }
       }
@@ -326,7 +329,7 @@ class Datelist extends DateElementBase {
         }
         // If the input is invalid and an error doesn't exist, set one.
         elseif ($form_state->getError($element) === NULL) {
-          $form_state->setError($element, t('The %field date is invalid.', ['%field' => !empty($element['#title']) ? $element['#title'] : '']));
+          $form_state->setError($element, t('The %field date is invalid.', ['%field' => $title]));
         }
       }
     }