From df1336840173145f0d862f3a7c3eb206678b1f97 Mon Sep 17 00:00:00 2001 From: Alex Pott Date: Wed, 29 May 2013 06:04:31 +0100 Subject: [PATCH] Issue #2003484 by sillygwailo: Rename Views method get_token_values_recursive() to getTokenValuesRecursive(). --- .../lib/Drupal/views/Plugin/views/field/FieldPluginBase.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 c4c2a24f270..63051bb84db 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 @@ -1476,7 +1476,7 @@ If you would like to have the characters \'[\' and \']\' use the html entity cod } // Get flattened set of tokens for any array depth in $_GET parameters. - $tokens += $this->get_token_values_recursive(drupal_container()->get('request')->query->all()); + $tokens += $this->getTokenValuesRecursive(drupal_container()->get('request')->query->all()); // Now add replacements for our fields. foreach ($this->view->display_handler->getHandlers('field') as $field => $handler) { @@ -1537,7 +1537,7 @@ If you would like to have the characters \'[\' and \']\' use the html entity cod * @return * An array of available tokens, with nested keys representative of the array structure. */ - function get_token_values_recursive(array $array, array $parent_keys = array()) { + protected function getTokenValuesRecursive(array $array, array $parent_keys = array()) { $tokens = array(); foreach ($array as $param => $val) { @@ -1547,7 +1547,7 @@ If you would like to have the characters \'[\' and \']\' use the html entity cod $child_parent_keys = $parent_keys; $child_parent_keys[] = $param; // Get the child tokens. - $child_tokens = $this->get_token_values_recursive($val, $child_parent_keys); + $child_tokens = $this->getTokenValuesRecursive($val, $child_parent_keys); // Add them to the current tokens array. $tokens += $child_tokens; }