Update to Drupal 8.0.0-beta15. For more information, see: https://www.drupal.org/node/2563023

This commit is contained in:
Pantheon Automation 2015-09-04 13:20:09 -07:00 committed by Greg Anderson
parent 2720a9ec4b
commit f3791f1da3
1898 changed files with 54300 additions and 11481 deletions

View file

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