Security update for Core, with self-updated composer

[yaffs-website] / web / core / modules / layout_discovery / layout_discovery.module

diff --git a/web/core/modules/layout_discovery/layout_discovery.module b/web/core/modules/layout_discovery/layout_discovery.module
index 3cffee92cc60ffe9eddb2f28adf97790947f860d..3eed9fe2f994443b499e6c10860882d52a129ec3 100644 (file)
--- a/web/core/modules/layout_discovery/layout_discovery.module
+++ b/web/core/modules/layout_discovery/layout_discovery.module
@@ -5,6 +5,9 @@
  * Provides hook implementations for Layout Discovery.
  */
 
+use Drupal\Core\Render\Element;
+use Drupal\Core\Template\Attribute;
+
 /**
  * Implements hook_help().
  */
@@ -13,7 +16,7 @@ function layout_discovery_help($route_name) {
     case 'help.page.layout_discovery':
       $output = '<h3>' . t('About') . '</h3>';
       $output .= '<p>' . t('Layout Discovery allows modules or themes to register layouts, and for other modules to list the available layouts and render them.') . '</p>';
-      $output .= '<p>' . t('For more information, see the <a href=":layout-discovery-documentation">online documentation for the Layout Discovery module</a>.', [':layout-discovery-documentation' => 'https://www.drupal.org/node/2619128']) . '</p>';
+      $output .= '<p>' . t('For more information, see the <a href=":layout-discovery-documentation">online documentation for the Layout Discovery module</a>.', [':layout-discovery-documentation' => 'https://www.drupal.org/docs/8/api/layout-api']) . '</p>';
       return $output;
   }
 }
@@ -36,4 +39,12 @@ function layout_discovery_theme() {
 function template_preprocess_layout(&$variables) {
   $variables['settings'] = isset($variables['content']['#settings']) ? $variables['content']['#settings'] : [];
   $variables['layout'] = isset($variables['content']['#layout']) ? $variables['content']['#layout'] : [];
+
+  // Create an attributes variable for each region.
+  foreach (Element::children($variables['content']) as $name) {
+    if (!isset($variables['content'][$name]['#attributes'])) {
+      $variables['content'][$name]['#attributes'] = [];
+    }
+    $variables['region_attributes'][$name] = new Attribute($variables['content'][$name]['#attributes']);
+  }
 }