diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/Entity.php b/core/modules/views/lib/Drupal/views/Plugin/views/area/Entity.php index 4a41d0af373..d552932299d 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/area/Entity.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/area/Entity.php @@ -96,7 +96,7 @@ class Entity extends AreaPluginBase { if (!$empty || !empty($this->options['empty'])) { $entity_id = $this->options['entity_id']; if ($this->options['tokenize']) { - $entity_id = $this->view->style_plugin->tokenize_value($entity_id, 0); + $entity_id = $this->view->style_plugin->tokenizeValue($entity_id, 0); } $entity_id = $this->globalTokenReplace($entity_id); if ($entity = entity_load($this->entityType, $entity_id)) { diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/Text.php b/core/modules/views/lib/Drupal/views/Plugin/views/area/Text.php index cd45efe2db3..dcc44b1158c 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/area/Text.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/area/Text.php @@ -67,7 +67,7 @@ class Text extends AreaPluginBase { public function renderTextarea($value, $format) { if ($value) { if ($this->options['tokenize']) { - $value = $this->view->style_plugin->tokenize_value($value, 0); + $value = $this->view->style_plugin->tokenizeValue($value, 0); } return check_markup($this->globalTokenReplace($value), $format, '', FALSE); } diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/TextCustom.php b/core/modules/views/lib/Drupal/views/Plugin/views/area/TextCustom.php index 55c547bc82f..86d8358e344 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/area/TextCustom.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/area/TextCustom.php @@ -61,7 +61,7 @@ class TextCustom extends AreaPluginBase { public function renderTextarea($value) { if ($value) { if ($this->options['tokenize']) { - $value = $this->view->style_plugin->tokenize_value($value, 0); + $value = $this->view->style_plugin->tokenizeValue($value, 0); } return $this->sanitizeValue($this->globalTokenReplace($value), 'xss_admin'); } diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php index 68fd8d67b79..ea3b9cceb9a 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php @@ -290,7 +290,7 @@ abstract class FieldPluginBase extends HandlerBase { function element_classes($row_index = NULL) { $classes = explode(' ', $this->options['element_class']); foreach ($classes as &$class) { - $class = $this->tokenize_value($class, $row_index); + $class = $this->tokenizeValue($class, $row_index); $class = drupal_clean_css_identifier($class); } return implode(' ', $classes); @@ -302,7 +302,7 @@ abstract class FieldPluginBase extends HandlerBase { * This function actually figures out which field was last and uses its * tokens so they will all be available. */ - function tokenize_value($value, $row_index = NULL) { + public function tokenizeValue($value, $row_index = NULL) { if (strpos($value, '[') !== FALSE || strpos($value, '!') !== FALSE || strpos($value, '%') !== FALSE) { $fake_item = array( 'alter_text' => TRUE, @@ -340,7 +340,7 @@ abstract class FieldPluginBase extends HandlerBase { public function elementLabelClasses($row_index = NULL) { $classes = explode(' ', $this->options['element_label_class']); foreach ($classes as &$class) { - $class = $this->tokenize_value($class, $row_index); + $class = $this->tokenizeValue($class, $row_index); $class = drupal_clean_css_identifier($class); } return implode(' ', $classes); @@ -352,7 +352,7 @@ abstract class FieldPluginBase extends HandlerBase { public function elementWrapperClasses($row_index = NULL) { $classes = explode(' ', $this->options['element_wrapper_class']); foreach ($classes as &$class) { - $class = $this->tokenize_value($class, $row_index); + $class = $this->tokenizeValue($class, $row_index); $class = drupal_clean_css_identifier($class); } return implode(' ', $classes); diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/Rss.php b/core/modules/views/lib/Drupal/views/Plugin/views/style/Rss.php index c0a8673a678..52b6374421d 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/style/Rss.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/style/Rss.php @@ -102,7 +102,7 @@ class Rss extends StylePluginBase { $description = $this->options['description']; // Allow substitutions from the first row. - $description = $this->tokenize_value($description, 0); + $description = $this->tokenizeValue($description, 0); return $description; } diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/StylePluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/style/StylePluginBase.php index 107e825e59c..453969a94ef 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/style/StylePluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/style/StylePluginBase.php @@ -186,7 +186,7 @@ abstract class StylePluginBase extends PluginBase { if ($this->usesRowClass()) { $class = $this->options['row_class']; if ($this->usesFields() && $this->view->field) { - $class = strip_tags($this->tokenize_value($class, $row_index)); + $class = strip_tags($this->tokenizeValue($class, $row_index)); } $classes = explode(' ', $class); @@ -200,7 +200,7 @@ abstract class StylePluginBase extends PluginBase { /** * Take a value and apply token replacement logic to it. */ - function tokenize_value($value, $row_index) { + public function tokenizeValue($value, $row_index) { if (strpos($value, '[') !== FALSE || strpos($value, '!') !== FALSE || strpos($value, '%') !== FALSE) { $fake_item = array( 'alter_text' => TRUE, diff --git a/core/modules/views/lib/Drupal/views/ViewExecutable.php b/core/modules/views/lib/Drupal/views/ViewExecutable.php index b4f76c2bd9a..e32c4c0c0be 100644 --- a/core/modules/views/lib/Drupal/views/ViewExecutable.php +++ b/core/modules/views/lib/Drupal/views/ViewExecutable.php @@ -1529,7 +1529,7 @@ class ViewExecutable { // Allow substitutions from the first row. if ($this->initStyle()) { - $title = $this->style_plugin->tokenize_value($title, 0); + $title = $this->style_plugin->tokenizeValue($title, 0); } return $title; }