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

Update Drupal core to 8.5.2 via Composer
author Chris Cannam
date Mon, 23 Apr 2018 09:46:53 +0100
parents 4c8ae668cc8c
children af1871eacc83
comparison
equal deleted inserted replaced
13:5fb285c0d0e3 14:1fec387a4317
155 else { 155 else {
156 $argName = $n->getAttribute('name'); 156 $argName = $n->getAttribute('name');
157 if (!is_null($args)) { 157 if (!is_null($args)) {
158 $argName = $args->getAttribute('name'); 158 $argName = $args->getAttribute('name');
159 } 159 }
160 $expr = new \Twig_Node_Expression_Name($argName, $n->getLine()); 160 $expr = new \Twig_Node_Expression_Name($argName, $n->getTemplateLine());
161 } 161 }
162 $placeholder = sprintf('%s%s', $argPrefix, $argName); 162 $placeholder = sprintf('%s%s', $argPrefix, $argName);
163 $text .= $placeholder; 163 $text .= $placeholder;
164 $expr->setAttribute('placeholder', $placeholder); 164 $expr->setAttribute('placeholder', $placeholder);
165 $tokens[] = $expr; 165 $tokens[] = $expr;
174 } 174 }
175 else { 175 else {
176 $text = $body->getAttribute('data'); 176 $text = $body->getAttribute('data');
177 } 177 }
178 178
179 return [new \Twig_Node([new \Twig_Node_Expression_Constant(trim($text), $body->getLine())]), $tokens]; 179 return [
180 new \Twig_Node([new \Twig_Node_Expression_Constant(trim($text), $body->getTemplateLine())]),
181 $tokens,
182 ];
180 } 183 }
181 184
182 } 185 }