Pull merge.

[yaffs-website] / web / core / lib / Drupal / Core / Template / TwigNodeVisitor.php

diff --git a/web/core/lib/Drupal/Core/Template/TwigNodeVisitor.php b/web/core/lib/Drupal/Core/Template/TwigNodeVisitor.php
index 1ebfa57de92aac065b397b158fdfcaacab0da9e6..5286242281a5c94b047163a4e1f96f163acd04bc 100644 (file)
--- a/web/core/lib/Drupal/Core/Template/TwigNodeVisitor.php
+++ b/web/core/lib/Drupal/Core/Template/TwigNodeVisitor.php
@@ -33,7 +33,7 @@ class TwigNodeVisitor extends \Twig_BaseNodeVisitor {
         return $node;
       }
       $class = get_class($node);
-      $line = $node->getLine();
+      $line = $node->getTemplateLine();
       return new $class(
         new \Twig_Node_Expression_Function('render_var', new \Twig_Node([$node->getNode('expr')]), $line),
         $line
@@ -43,10 +43,11 @@ class TwigNodeVisitor extends \Twig_BaseNodeVisitor {
     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.
+        // Use our own escape filter that is MarkupInterface aware.
         $node->getNode('filter')->setAttribute('value', 'drupal_escape');
 
-        // Store that we have a filter active already that knows how to deal with render arrays.
+        // Store that we have a filter active already that knows
+        // how to deal with render arrays.
         $this->skipRenderVarFunction = TRUE;
       }
     }