Merge branch '1.x' into 2.x

* 1.x:
  fixed import macros from a template string
This commit is contained in:
Fabien Potencier
2019-04-22 18:01:41 +02:00
7 changed files with 37 additions and 3 deletions
+1 -1
View File
@@ -46,7 +46,7 @@ class ImportNode extends Node
->repr($this->getTemplateName())
->raw(', ')
->repr($this->getTemplateLine())
->raw(')')
->raw(')->unwrap()')
;
}