opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to drupal 8.0.0-rc1. For more information, see https://www.drupal.org/node/2582663

Browse source
This commit is contained in:
Greg Anderson 2015-10-08 11:40:12 -07:00
parent eb34d130a8
commit f32e58e4b1
8476 changed files with 211648 additions and 170042 deletions
Download patch file Download diff file Expand all files Collapse all files

9
core/modules/views/views.tokens.inc
View file

@ -5,7 +5,6 @@
* Token integration for the views module.
*/
use Drupal\Component\Utility\Html;
use Drupal\Core\Render\BubbleableMetadata;
/**
@ -74,8 +73,6 @@ function views_tokens($type, $tokens, array $data, array $options, BubbleableMet
if (isset($options['language'])) {
$url_options['language'] = $options['language'];
}
$sanitize = !empty($options['sanitize']);
$replacements = array();
if ($type == 'view' && !empty($data['view'])) {
@ -87,11 +84,11 @@ function views_tokens($type, $tokens, array $data, array $options, BubbleableMet
foreach ($tokens as $name => $original) {
switch ($name) {
case 'label':
$replacements[$original] = $sanitize ? Html::escape($view->storage->label()) : $view->storage->label();
$replacements[$original] = $view->storage->label();
break;
case 'description':
$replacements[$original] = $sanitize ? Html::escape($view->storage->get('description')) : $view->storage->get('description');
$replacements[$original] = $view->storage->get('description');
break;
case 'id':
@ -100,7 +97,7 @@ function views_tokens($type, $tokens, array $data, array $options, BubbleableMet
case 'title':
$title = $view->getTitle();
$replacements[$original] = $sanitize ? Html::escape($title) : $title;
$replacements[$original] = $title;
break;
case 'url':