Updated to Drupal 8.5. Core Media not yet in use.

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

diff --git a/web/core/lib/Drupal/Core/Template/TwigNodeTrans.php b/web/core/lib/Drupal/Core/Template/TwigNodeTrans.php
index 264a511172bfc3e332db986dbdb80f63f50fb357..c0691dbca6ad4523bb75a03325041ab741f643bd 100644 (file)
--- a/web/core/lib/Drupal/Core/Template/TwigNodeTrans.php
+++ b/web/core/lib/Drupal/Core/Template/TwigNodeTrans.php
@@ -157,7 +157,7 @@ class TwigNodeTrans extends \Twig_Node {
             if (!is_null($args)) {
               $argName = $args->getAttribute('name');
             }
-            $expr = new \Twig_Node_Expression_Name($argName, $n->getLine());
+            $expr = new \Twig_Node_Expression_Name($argName, $n->getTemplateLine());
           }
           $placeholder = sprintf('%s%s', $argPrefix, $argName);
           $text .= $placeholder;
@@ -176,7 +176,10 @@ class TwigNodeTrans extends \Twig_Node {
       $text = $body->getAttribute('data');
     }
 
-    return [new \Twig_Node([new \Twig_Node_Expression_Constant(trim($text), $body->getLine())]), $tokens];
+    return [
+      new \Twig_Node([new \Twig_Node_Expression_Constant(trim($text), $body->getTemplateLine())]),
+      $tokens,
+    ];
   }
 
 }