summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Pott2015-01-12 09:12:11 (GMT)
committerAlex Pott2015-01-12 09:12:11 (GMT)
commitc706fd78a351d70d26ebbceb5f60d9c2fab5c97d (patch)
tree43cac5fcb6cb0233e93538b89ce1b73c2ac12600
parentefbaa69a32c8a700c13eace7e912113fc4cdc1a5 (diff)
Issue #2404673 by vladan.me, Poornima3: Property format.name is now protected
-rw-r--r--core/modules/filter/src/Tests/TextFormatElementFormTest.php4
-rw-r--r--core/modules/filter/templates/filter-guidelines.html.twig2
2 files changed, 5 insertions, 1 deletions
diff --git a/core/modules/filter/src/Tests/TextFormatElementFormTest.php b/core/modules/filter/src/Tests/TextFormatElementFormTest.php
index d317db8..f2d682b 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 4341349..783992b 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>