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

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

6
core/modules/system/system.tokens.inc
View file

@ -7,7 +7,7 @@
* This file handles tokens for the global 'site' and 'date' tokens.
*/
use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\Html;
use Drupal\Component\Utility\Xss;
use Drupal\Core\Datetime\Entity\DateFormat;
use Drupal\Core\Render\BubbleableMetadata;
@ -111,7 +111,7 @@ function system_tokens($type, $tokens, array $data, array $options, BubbleableMe
$config = \Drupal::config('system.site');
$bubbleable_metadata->addCacheableDependency($config);
$site_name = $config->get('name');
$replacements[$original] = $sanitize ? SafeMarkup::checkPlain($site_name) : $site_name;
$replacements[$original] = $sanitize ? Html::escape($site_name) : $site_name;
break;
case 'slogan':
@ -188,7 +188,7 @@ function system_tokens($type, $tokens, array $data, array $options, BubbleableMe
break;
case 'raw':
$replacements[$original] = $sanitize ? SafeMarkup::checkPlain($date) : $date;
$replacements[$original] = $sanitize ? Html::escape($date) : $date;
break;
}
}