Upgraded drupal core with security updates

[yaffs-website] / web / core / modules / views / src / Plugin / views / field / FieldPluginBase.php

diff --git a/web/core/modules/views/src/Plugin/views/field/FieldPluginBase.php b/web/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
index 48c59ef7093acecf82a45fc38656f5afd6ac018b..fb6b5bfd4d9c0d7742d2ab55ec8b91734e6f3b03 100644 (file)
--- a/web/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
@@ -321,9 +321,9 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
    * {@inheritdoc}
    */
   public function elementClasses($row_index = NULL) {
-    $classes = explode(' ', $this->options['element_class']);
+    $classes = $this->tokenizeValue($this->options['element_class'], $row_index);
+    $classes = explode(' ', $classes);
     foreach ($classes as &$class) {
-      $class = $this->tokenizeValue($class, $row_index);
       $class = Html::cleanCssIdentifier($class);
     }
     return implode(' ', $classes);
@@ -368,9 +368,9 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
    * {@inheritdoc}
    */
   public function elementLabelClasses($row_index = NULL) {
-    $classes = explode(' ', $this->options['element_label_class']);
+    $classes = $this->tokenizeValue($this->options['element_label_class'], $row_index);
+    $classes = explode(' ', $classes);
     foreach ($classes as &$class) {
-      $class = $this->tokenizeValue($class, $row_index);
       $class = Html::cleanCssIdentifier($class);
     }
     return implode(' ', $classes);
@@ -380,9 +380,9 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
    * {@inheritdoc}
    */
   public function elementWrapperClasses($row_index = NULL) {
-    $classes = explode(' ', $this->options['element_wrapper_class']);
+    $classes = $this->tokenizeValue($this->options['element_wrapper_class'], $row_index);
+    $classes = explode(' ', $classes);
     foreach ($classes as &$class) {
-      $class = $this->tokenizeValue($class, $row_index);
       $class = Html::cleanCssIdentifier($class);
     }
     return implode(' ', $classes);