From c706fd78a351d70d26ebbceb5f60d9c2fab5c97d Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Mon, 12 Jan 2015 09:12:11 +0000
Subject: [PATCH] Issue #2404673 by vladan.me, Poornima3: Property format.name
 is now protected

---
 core/modules/filter/src/Tests/TextFormatElementFormTest.php | 4 ++++
 core/modules/filter/templates/filter-guidelines.html.twig   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/modules/filter/src/Tests/TextFormatElementFormTest.php b/core/modules/filter/src/Tests/TextFormatElementFormTest.php
index d317db8e9a6af40..f2d682b574003b3 100644
--- a/core/modules/filter/src/Tests/TextFormatElementFormTest.php
+++ b/core/modules/filter/src/Tests/TextFormatElementFormTest.php
@@ -117,6 +117,10 @@ class TextFormatElementFormTest extends KernelTestBase implements FormInterface
     $output = $this->render($form);
     $this->setRawContent($output);
     $this->assertFieldByName('textformat[value]');
+    $this->assertRaw('<h4 class="label">Full HTML</h4>');
+    $this->assertRaw('<h4 class="label">Filtered HTML</h4>');
+    $this->assertRaw('<h4 class="label">Test format</h4>');
+    $this->assertNoPattern('|<h4[^>]*></h4>|', 'No empty H4 element found.');
   }
 
   /**
diff --git a/core/modules/filter/templates/filter-guidelines.html.twig b/core/modules/filter/templates/filter-guidelines.html.twig
index 4341349e2720b0b..783992bece2d91c 100644
--- a/core/modules/filter/templates/filter-guidelines.html.twig
+++ b/core/modules/filter/templates/filter-guidelines.html.twig
@@ -26,6 +26,6 @@
   ]
 %}
 <div{{ attributes.addClass(classes) }}>
-  <h4 class="label">{{ format.name }}</h4>
+  <h4 class="label">{{ format.label }}</h4>
   {{ tips }}
 </div>