From 58abc5cdc1571470a7deab871f7112d7f656d0c7 Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Tue, 17 Sep 2019 10:25:57 +0100
Subject: [PATCH] Issue #3059232 by idebr, KelvinWong, keithnull, PCate,
 andrewmacpherson, huzooka, lauriii: Views mini pager Twig template has broken
 "aria-labelledby" reference

---
 core/modules/views/templates/views-mini-pager.html.twig      | 5 +++--
 core/modules/views/views.theme.inc                           | 2 ++
 .../themes/classy/templates/views/views-mini-pager.html.twig | 5 +++--
 .../themes/stable/templates/views/views-mini-pager.html.twig | 5 +++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/core/modules/views/templates/views-mini-pager.html.twig b/core/modules/views/templates/views-mini-pager.html.twig
index 2f36b160c5b4..b18eaef98ef0 100644
--- a/core/modules/views/templates/views-mini-pager.html.twig
+++ b/core/modules/views/templates/views-mini-pager.html.twig
@@ -4,6 +4,7 @@
  * Default theme implementation for a views mini-pager.
  *
  * Available variables:
+ * - heading_id: Pagination heading ID.
  * - items: List of pager items.
  *
  * @see template_preprocess_views_mini_pager()
@@ -12,8 +13,8 @@
  */
 #}
 {% if items.previous or items.next %}
-  <nav role="navigation" aria-labelledby="pagination-heading">
-    <h4 class="visually-hidden">{{ 'Pagination'|t }}</h4>
+  <nav role="navigation" aria-labelledby="{{ heading_id }}">
+    <h4 id="{{ heading_id }}" class="visually-hidden">{{ 'Pagination'|t }}</h4>
     <ul class="js-pager__items">
       {% if items.previous %}
         <li>
diff --git a/core/modules/views/views.theme.inc b/core/modules/views/views.theme.inc
index e7ae6ad26725..f2ea74682912 100644
--- a/core/modules/views/views.theme.inc
+++ b/core/modules/views/views.theme.inc
@@ -1034,6 +1034,8 @@ function template_preprocess_views_mini_pager(&$variables) {
   // This is based on the entire current query string. We need to ensure
   // cacheability is affected accordingly.
   $variables['#cache']['contexts'][] = 'url.query_args';
+
+  $variables['heading_id'] = Html::getUniqueId('pagination-heading');
 }
 
 /**
diff --git a/core/themes/classy/templates/views/views-mini-pager.html.twig b/core/themes/classy/templates/views/views-mini-pager.html.twig
index 124700b477b6..4b46f2bb1f69 100644
--- a/core/themes/classy/templates/views/views-mini-pager.html.twig
+++ b/core/themes/classy/templates/views/views-mini-pager.html.twig
@@ -4,14 +4,15 @@
  * Theme override for a views mini-pager.
  *
  * Available variables:
+ * - heading_id: Pagination heading ID.
  * - items: List of pager items.
  *
  * @see template_preprocess_views_mini_pager()
  */
 #}
 {% if items.previous or items.next %}
-  <nav class="pager" role="navigation" aria-labelledby="pagination-heading">
-    <h4 class="pager__heading visually-hidden">{{ 'Pagination'|t }}</h4>
+  <nav class="pager" role="navigation" aria-labelledby="{{ heading_id }}">
+    <h4 id="{{ heading_id }}" class="pager__heading visually-hidden">{{ 'Pagination'|t }}</h4>
     <ul class="pager__items js-pager__items">
       {% if items.previous %}
         <li class="pager__item pager__item--previous">
diff --git a/core/themes/stable/templates/views/views-mini-pager.html.twig b/core/themes/stable/templates/views/views-mini-pager.html.twig
index 08d794b8cf69..24f8f7aa994e 100644
--- a/core/themes/stable/templates/views/views-mini-pager.html.twig
+++ b/core/themes/stable/templates/views/views-mini-pager.html.twig
@@ -4,14 +4,15 @@
  * Theme override for a views mini-pager.
  *
  * Available variables:
+ * - heading_id: Pagination heading ID.
  * - items: List of pager items.
  *
  * @see template_preprocess_views_mini_pager()
  */
 #}
 {% if items.previous or items.next %}
-  <nav role="navigation" aria-labelledby="pagination-heading">
-    <h4 class="visually-hidden">{{ 'Pagination'|t }}</h4>
+  <nav role="navigation" aria-labelledby="{{ heading_id }}">
+    <h4 id="{{ heading_id }}" class="visually-hidden">{{ 'Pagination'|t }}</h4>
     <ul class="js-pager__items">
       {% if items.previous %}
         <li>