diff core/lib/Drupal/Core/Template/TwigNodeTrans.php @ 14:1fec387a4317

Update Drupal core to 8.5.2 via Composer

--- a/core/lib/Drupal/Core/Template/TwigNodeTrans.php	Mon Apr 23 09:33:26 2018 +0100
+++ b/core/lib/Drupal/Core/Template/TwigNodeTrans.php	Mon Apr 23 09:46:53 2018 +0100
@@ -157,7 +157,7 @@
             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 @@
       $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,
+    ];
   }
 
 }