diff --git a/core/modules/views/src/Plugin/views/PluginBase.php b/core/modules/views/src/Plugin/views/PluginBase.php index 23d9260..69c4f19 100644 --- a/core/modules/views/src/Plugin/views/PluginBase.php +++ b/core/modules/views/src/Plugin/views/PluginBase.php @@ -335,7 +335,7 @@ public function globalTokenReplace($string = '', array $options = array()) { /** * Replaces Views' tokens in a given string. The resulting string will be - * sanitized with SafeMarkup::checkAdminXss. + * sanitized with Xss::filterAdmin. * * This used to be a simple strtr() scattered throughout the code. Some Views * tokens, such as arguments (e.g.: %1 or !1), still use the old format so we @@ -350,11 +350,11 @@ public function globalTokenReplace($string = '', array $options = array()) { */ protected function viewsTokenReplace($text, $tokens) { if (!strlen($text)) { - // No need to run checkAdminXss on an empty string. + // No need to run filterAdmin on an empty string. return ''; } if (empty($tokens)) { - return SafeMarkup::checkAdminXss($text); + return Xss::filterAdmin($text); } // Separate Twig tokens from other tokens (e.g.: contextual filter tokens in diff --git a/core/modules/views/src/Plugin/views/style/StylePluginBase.php b/core/modules/views/src/Plugin/views/style/StylePluginBase.php index 95b55f1..a29c86c 100644 --- a/core/modules/views/src/Plugin/views/style/StylePluginBase.php +++ b/core/modules/views/src/Plugin/views/style/StylePluginBase.php @@ -240,9 +240,9 @@ public function tokenizeValue($value, $row_index) { $value = $this->viewsTokenReplace($value, $tokens); } else { - // ::viewsTokenReplace() will run SafeMarkup::checkAdminXss on the + // ::viewsTokenReplace() will run Xss::filterAdmin on the // resulting string. We do the same here for consistency. - $value = SafeMarkup::checkAdminXss($value); + $value = Xss::filterAdmin($value); } return $value; }