From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Sun, 4 Aug 2013 13:01:42 +0000 (+0200)
Subject: merged branch fabpot/complex-template_from_string (PR #1154)
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=4e7094f6a3831dc86b4963d805c4567f4076fce3;p=web%2Fkonrad%2Ftwig.git

merged branch fabpot/complex-template_from_string (PR #1154)

This PR was merged into the master branch.

Discussion
----------

fixed template_from_string when the template includes or extends other ones

This should fix #1134

Commits
-------

1b5bf91 fixed template_from_string when the template includes or extends other ones
---

4e7094f6a3831dc86b4963d805c4567f4076fce3
diff --cc CHANGELOG
index 9276586,b5b2074..956dcb1
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -1,8 -1,6 +1,9 @@@
  * 1.14.0 (2013-XX-XX)
  
+  * fixed template_from_string when the template includes or extends other ones
 + * improved the performance of the filesystem loader
 + * fixed a crash of the C extension on an edge case
 + * fixed the filesystem loader cache when a template name exists in several namespaces
   * added support for calling macros defined in a template without importing them first
   * added support for named arguments for macros
   * replaced a PHP fatal error with an exception when  a macro does not exist