Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2003484 by sillygwailo: Rename Views method get_token_values_recursive() to getTokenValuesRecursive().

8.0.x
Alex Pott 2013-05-29 06:04:31 +01:00
parent c3b21afef2
commit df13368401
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
View File

@ -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. // 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. // Now add replacements for our fields.
foreach ($this->view->display_handler->getHandlers('field') as $field => $handler) { 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 * @return
* An array of available tokens, with nested keys representative of the array structure. * 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(); $tokens = array();
foreach ($array as $param => $val) { 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 = $parent_keys;
$child_parent_keys[] = $param; $child_parent_keys[] = $param;
// Get the child tokens. // 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. // Add them to the current tokens array.
$tokens += $child_tokens; $tokens += $child_tokens;
} }