From 20533256d2c3ca00a636a63068023ac4342e9f1a Mon Sep 17 00:00:00 2001 From: Alex Pott <alex.a.pott@googlemail.com> Date: Fri, 7 Aug 2015 17:44:23 +0100 Subject: [PATCH] Issue #2536024 by JeroenT: Remove deprecated SafeMarkup::checkAdminXss() --- .../Drupal/Component/Utility/SafeMarkup.php | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/core/lib/Drupal/Component/Utility/SafeMarkup.php b/core/lib/Drupal/Component/Utility/SafeMarkup.php index 4d492661535d..af9170d78ef7 100644 --- a/core/lib/Drupal/Component/Utility/SafeMarkup.php +++ b/core/lib/Drupal/Component/Utility/SafeMarkup.php @@ -138,30 +138,6 @@ public static function escape($string) { return static::isSafe($string) ? $string : static::checkPlain($string); } - /** - * Applies a very permissive XSS/HTML filter for admin-only use. - * - * Note: This method only filters if $string is not marked safe already. - * - * @deprecated as of Drupal 8.0.x, will be removed before Drupal 8.0.0. If the - * string used as part of a @link theme_render render array @endlink use - * #markup to allow the render system to filter automatically. If the result - * is not being used directly in the rendering system (for example, when its - * result is being combined with other strings before rendering), use - * Xss::filterAdmin(). Otherwise, use SafeMarkup::xssFilter() and the tag - * list provided by Xss::getAdminTagList() instead. In the rare instance - * that the caller does not want to filter strings that are marked safe - * already, it needs to check SafeMarkup::isSafe() itself. - * - * @see \Drupal\Component\Utility\SafeMarkup::xssFilter() - * @see \Drupal\Component\Utility\SafeMarkup::isSafe() - * @see \Drupal\Component\Utility\Xss::filterAdmin() - * @see \Drupal\Component\Utility\Xss::getAdminTagList() - */ - public static function checkAdminXss($string) { - return static::isSafe($string) ? $string : static::xssFilter($string, Xss::getAdminTagList()); - } - /** * Filters HTML for XSS vulnerabilities and marks the result as safe. * -- GitLab