From 2db5ea00a7f42caf23124904442e46d20f569023 Mon Sep 17 00:00:00 2001
From: Chi <Chi@556138.no-reply.drupal.org>
Date: Tue, 16 Apr 2019 17:46:02 +0500
Subject: [PATCH] Issue #3013136 by Majdi: Page title block always empty

---
 src/TwigExtension.php                  | 12 ++++++++++++
 tests/src/Functional/TwigTweakTest.php |  1 -
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/TwigExtension.php b/src/TwigExtension.php
index b79a508..a9de162 100644
--- a/src/TwigExtension.php
+++ b/src/TwigExtension.php
@@ -116,6 +116,14 @@ class TwigExtension extends \Twig_Extension {
       return;
     }
 
+    // Title block needs special treatment.
+    if ($block_plugin instanceof TitleBlockPluginInterface) {
+      $request = \Drupal::request();
+      $route_match = \Drupal::routeMatch();
+      $title = \Drupal::service('title_resolver')->getTitle($request, $route_match->getRouteObject());
+      $block_plugin->setTitle($title);
+    }
+
     $content = $block_plugin->build();
 
     if ($content && !Element::isEmpty($content)) {
@@ -148,6 +156,10 @@ class TwigExtension extends \Twig_Extension {
       ];
     }
 
+    if ($block_plugin instanceof TitleBlockPluginInterface) {
+      $build['#cache']['contexts'][] = 'url';
+    }
+
     if (!empty($content)) {
       CacheableMetadata::createFromRenderArray($build)
         ->merge(CacheableMetadata::createFromRenderArray($content))
diff --git a/tests/src/Functional/TwigTweakTest.php b/tests/src/Functional/TwigTweakTest.php
index bdcf145..f313d63 100644
--- a/tests/src/Functional/TwigTweakTest.php
+++ b/tests/src/Functional/TwigTweakTest.php
@@ -57,7 +57,6 @@ class TwigTweakTest extends BrowserTestBase {
       'breakpoint_group' => 'responsive_image',
     ])->save();
 
-
     // Setup Russian.
     ConfigurableLanguage::createFromLangcode('ru')->save();
   }