commit 7faf36ad9cdfbffb3a3555d619a0cca525ea949a
Author: Joel Pittet <joel@pittet.ca>
Date:   Sat Aug 15 13:50:35 2015 -0500

    fixes

diff --git a/core/modules/filter/src/Plugin/Filter/FilterHtml.php b/core/modules/filter/src/Plugin/Filter/FilterHtml.php
index 9f154cf..06ca10d 100644
--- a/core/modules/filter/src/Plugin/Filter/FilterHtml.php
+++ b/core/modules/filter/src/Plugin/Filter/FilterHtml.php
@@ -147,7 +147,7 @@ public function tips($long = FALSE) {
           array('data' => SafeMarkup::format('<code>@var</code>', array('@var' => $tips[$tag][1])), 'class' => array('type')),
           // The markup must not be escaped because this is the example output
           // for the user.
-          array('data' => ['#markup' => $tips[$tag][1]], 'class' => array('get'))
+          array('data' => ['#markup' => $tips[$tag][1]], 'class' => array('get')),
         );
       }
       else {
@@ -180,7 +180,7 @@ public function tips($long = FALSE) {
         array('data' => SafeMarkup::format('<code>@var</code>', array('@var' => $entity[1])), 'class' => array('type')),
         // The markup must not be escaped because this is the example output
         // for the user.
-        array('data' => ['#markup' => $entity[1]], 'class' => array('get'))
+        array('data' => ['#markup' => $entity[1]], 'class' => array('get')),
       );
     }
     $table = array(
diff --git a/core/modules/filter/src/Tests/FilterAdminTest.php b/core/modules/filter/src/Tests/FilterAdminTest.php
index 7e6a2d3..6f29c41 100644
--- a/core/modules/filter/src/Tests/FilterAdminTest.php
+++ b/core/modules/filter/src/Tests/FilterAdminTest.php
@@ -370,10 +370,10 @@ function testFilterTipHtmlEscape() {
 
     // It is not possible to test the whole filter tip page.
     // Therefore we test only some parts.
-    $link = '<a href="' . $base_url . '">' . SafeMarkup::checkPlain(\Drupal::config('system.site')->get('name')) . '</a>';
+    $link = '<a href="' . $base_url . '">' . htmlspecialchars(\Drupal::config('system.site')->get('name'), ENT_QUOTES, 'utf-8') . '</a>';
     $ampersand = '&amp;';
-    $link_as_code = '<code>' . $link . '</code>';
-    $ampersand_as_code = '<code>' . $ampersand . '</code>';
+    $link_as_code = '<code>' . htmlspecialchars($link, ENT_QUOTES, 'utf-8') . '</code>';
+    $ampersand_as_code = '<code>' . htmlspecialchars($ampersand, ENT_QUOTES, 'utf-8') . '</code>';
 
     $this->drupalGet('filter/tips');