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

Update to Drupal 8.0.1. For more information, see https://www.drupal.org/node/2627402

Browse source
This commit is contained in:
Pantheon Automation 2015-12-02 11:38:43 -08:00 • committed by Greg Anderson
parent 013aaaf2ff
commit 1a0e9d9fac
153 changed files with 1268 additions and 670 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/lib/Drupal/Core/Template/TwigExtension.php
View file

@ -438,7 +438,7 @@ class TwigExtension extends \Twig_Extension {
$return = $arg->toString();
}
else {
throw new \Exception(t('Object of type "@class" cannot be printed.', array('@class' => get_class($arg))));
throw new \Exception('Object of type ' . get_class($arg) . ' cannot be printed.');
}
}
@ -516,7 +516,7 @@ class TwigExtension extends \Twig_Extension {
return $arg->toString();
}
else {
throw new \Exception(t('Object of type "@class" cannot be printed.', array('@class' => get_class($arg))));
throw new \Exception('Object of type ' . get_class($arg) . ' cannot be printed.');
}
}

2
core/lib/Drupal/Core/Template/TwigNodeVisitor.php
View file

@ -45,7 +45,7 @@ class TwigNodeVisitor extends \Twig_BaseNodeVisitor {
);
}
// Change the 'escape' filter to our own 'drupal_escape' filter.
else if ($node instanceof \Twig_Node_Expression_Filter) {
elseif ($node instanceof \Twig_Node_Expression_Filter) {
$name = $node->getNode('filter')->getAttribute('value');
if ('escape' == $name || 'e' == $name) {
// Use our own escape filter that is SafeMarkup aware.