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

Issue #2003268 by dwieeb: Rename Views method get_render_tokens() to getRenderTokens().

8.0.x
Alex Pott 2013-05-28 23:23:43 +01:00
parent b880d8f4a9
commit be273778e1
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/contextual/lib/Drupal/contextual/Plugin/views/field/ContextualLinks.php
View File

@ -82,7 +82,7 @@ class ContextualLinks extends FieldPluginBase {
} }
if (!empty($title) && !empty($path)) { if (!empty($title) && !empty($path)) {
// Make sure that tokens are replaced for this paths as well. // Make sure that tokens are replaced for this paths as well.
$tokens = $this->get_render_tokens(array()); $tokens = $this->getRenderTokens(array());
$path = strip_tags(decode_entities(strtr($path, $tokens))); $path = strip_tags(decode_entities(strtr($path, $tokens)));
$links[$field] = array( $links[$field] = array(

2
core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
View File

@ -992,7 +992,7 @@ abstract class DisplayPluginBase extends PluginBase {
/** /**
* Returns to tokens for arguments. * Returns to tokens for arguments.
* *
* This function is similar to views_handler_field::get_render_tokens() * This function is similar to views_handler_field::getRenderTokens()
* but without fields tokens. * but without fields tokens.
*/ */
public function getArgumentsTokens() { public function getArgumentsTokens() {

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

@ -321,7 +321,7 @@ abstract class FieldPluginBase extends HandlerBase {
$tokens = $last_field->last_tokens; $tokens = $last_field->last_tokens;
} }
else { else {
$tokens = $last_field->get_render_tokens($fake_item); $tokens = $last_field->getRenderTokens($fake_item);
} }
} }
@ -1207,7 +1207,7 @@ If you would like to have the characters \'[\' and \']\' use the html entity cod
$value = $this->last_render; $value = $this->last_render;
if (!empty($alter['alter_text']) && $alter['text'] !== '') { if (!empty($alter['alter_text']) && $alter['text'] !== '') {
$tokens = $this->get_render_tokens($alter); $tokens = $this->getRenderTokens($alter);
$value = $this->render_altered($alter, $tokens); $value = $this->render_altered($alter, $tokens);
} }
@ -1242,7 +1242,7 @@ If you would like to have the characters \'[\' and \']\' use the html entity cod
$length = strlen($value); $length = strlen($value);
$value = $this->render_trim_text($alter, $value); $value = $this->render_trim_text($alter, $value);
if ($this->options['alter']['more_link'] && strlen($value) < $length) { if ($this->options['alter']['more_link'] && strlen($value) < $length) {
$tokens = $this->get_render_tokens($alter); $tokens = $this->getRenderTokens($alter);
$more_link_text = $this->options['alter']['more_link_text'] ? $this->options['alter']['more_link_text'] : t('more'); $more_link_text = $this->options['alter']['more_link_text'] ? $this->options['alter']['more_link_text'] : t('more');
$more_link_text = strtr(filter_xss_admin($more_link_text), $tokens); $more_link_text = strtr(filter_xss_admin($more_link_text), $tokens);
$more_link_path = $this->options['alter']['more_link_path']; $more_link_path = $this->options['alter']['more_link_path'];
@ -1268,7 +1268,7 @@ If you would like to have the characters \'[\' and \']\' use the html entity cod
if (!empty($alter['make_link']) && !empty($alter['path'])) { if (!empty($alter['make_link']) && !empty($alter['path'])) {
if (!isset($tokens)) { if (!isset($tokens)) {
$tokens = $this->get_render_tokens($alter); $tokens = $this->getRenderTokens($alter);
} }
$value = $this->render_as_link($alter, $value, $tokens); $value = $this->render_as_link($alter, $value, $tokens);
} }
@ -1457,7 +1457,7 @@ If you would like to have the characters \'[\' and \']\' use the html entity cod
* are available and gets their values. This will then be * are available and gets their values. This will then be
* used in one giant str_replace(). * used in one giant str_replace().
*/ */
function get_render_tokens($item) { public function getRenderTokens($item) {
$tokens = array(); $tokens = array();
if (!empty($this->view->build_info['substitutions'])) { if (!empty($this->view->build_info['substitutions'])) {
$tokens = $this->view->build_info['substitutions']; $tokens = $this->view->build_info['substitutions'];

2
core/modules/views/lib/Drupal/views/Plugin/views/field/Links.php
View File

@ -66,7 +66,7 @@ abstract class Links extends FieldPluginBase {
$path = $this->view->field[$field]->options['alter']['path']; $path = $this->view->field[$field]->options['alter']['path'];
} }
// Make sure that tokens are replaced for this paths as well. // Make sure that tokens are replaced for this paths as well.
$tokens = $this->get_render_tokens(array()); $tokens = $this->getRenderTokens(array());
$path = strip_tags(decode_entities(strtr($path, $tokens))); $path = strip_tags(decode_entities(strtr($path, $tokens)));
$links[$field] = array( $links[$field] = array(

2
core/modules/views/lib/Drupal/views/Plugin/views/style/StylePluginBase.php
View File

@ -638,7 +638,7 @@ abstract class StylePluginBase extends PluginBase {
$this->rendered_fields[$count][$id] = $this->view->field[$id]->theme($row); $this->rendered_fields[$count][$id] = $this->view->field[$id]->theme($row);
} }
$this->row_tokens[$count] = $this->view->field[$id]->get_render_tokens(array()); $this->row_tokens[$count] = $this->view->field[$id]->getRenderTokens(array());
} }
} }
unset($this->view->row_index); unset($this->view->row_index);