Security update for Core, with self-updated composer

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

diff --git a/web/core/lib/Drupal/Core/Datetime/Element/DateElementBase.php b/web/core/lib/Drupal/Core/Datetime/Element/DateElementBase.php
index 63b9abb871b1a808aef4f6b5ee490facc190fee7..433cdf8b1810b88001dc723a7d93045969b35749 100644 (file)
--- a/web/core/lib/Drupal/Core/Datetime/Element/DateElementBase.php
+++ b/web/core/lib/Drupal/Core/Datetime/Element/DateElementBase.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Core\Datetime\Element;
 
+use Drupal\Component\Utility\NestedArray;
 use Drupal\Core\Datetime\DrupalDateTime;
 use Drupal\Core\Render\Element\FormElement;
 
@@ -69,4 +70,36 @@ abstract class DateElementBase extends FormElement {
     return [$min_year, $max_year];
   }
 
+  /**
+   * Returns the most relevant title of a datetime element.
+   *
+   * Since datetime form elements often consist of combined date and time fields
+   * the element title might not be located on the element itself but on the
+   * parent container element.
+   *
+   * @param array $element
+   *   The element being processed.
+   * @param array $complete_form
+   *   The complete form structure.
+   *
+   * @return string
+   *   The title.
+   */
+  protected static function getElementTitle($element, $complete_form) {
+    $title = '';
+    if (!empty($element['#title'])) {
+      $title = $element['#title'];
+    }
+    else {
+      $parents = $element['#array_parents'];
+      array_pop($parents);
+      $parent_element = NestedArray::getValue($complete_form, $parents);
+      if (!empty($parent_element['#title'])) {
+        $title = $parent_element['#title'];
+      }
+    }
+
+    return $title;
+  }
+
 }