Commit be273778 authored by alexpott's avatar alexpott

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

parent b880d8f4
......@@ -82,7 +82,7 @@ function render($values) {
}
if (!empty($title) && !empty($path)) {
// 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)));
$links[$field] = array(
......
......@@ -992,7 +992,7 @@ public function optionLink($text, $section, $class = '', $title = '') {
/**
* 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.
*/
public function getArgumentsTokens() {
......
......@@ -321,7 +321,7 @@ function tokenize_value($value, $row_index = NULL) {
$tokens = $last_field->last_tokens;
}
else {
$tokens = $last_field->get_render_tokens($fake_item);
$tokens = $last_field->getRenderTokens($fake_item);
}
}
......@@ -1207,7 +1207,7 @@ function render_text($alter) {
$value = $this->last_render;
if (!empty($alter['alter_text']) && $alter['text'] !== '') {
$tokens = $this->get_render_tokens($alter);
$tokens = $this->getRenderTokens($alter);
$value = $this->render_altered($alter, $tokens);
}
......@@ -1242,7 +1242,7 @@ function render_text($alter) {
$length = strlen($value);
$value = $this->render_trim_text($alter, $value);
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 = strtr(filter_xss_admin($more_link_text), $tokens);
$more_link_path = $this->options['alter']['more_link_path'];
......@@ -1268,7 +1268,7 @@ function render_text($alter) {
if (!empty($alter['make_link']) && !empty($alter['path'])) {
if (!isset($tokens)) {
$tokens = $this->get_render_tokens($alter);
$tokens = $this->getRenderTokens($alter);
}
$value = $this->render_as_link($alter, $value, $tokens);
}
......@@ -1457,7 +1457,7 @@ function render_as_link($alter, $text, $tokens) {
* are available and gets their values. This will then be
* used in one giant str_replace().
*/
function get_render_tokens($item) {
public function getRenderTokens($item) {
$tokens = array();
if (!empty($this->view->build_info['substitutions'])) {
$tokens = $this->view->build_info['substitutions'];
......
......@@ -66,7 +66,7 @@ protected function getLinks() {
$path = $this->view->field[$field]->options['alter']['path'];
}
// 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)));
$links[$field] = array(
......
......@@ -638,7 +638,7 @@ protected function render_fields(array $result) {
$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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment