twig implementation

[github/wallabag/wallabag.git] / vendor / twig / twig / lib / Twig / Error.php

diff --git a/inc/3rdparty/Twig/Error.php b/vendor/twig/twig/lib/Twig/Error.php
similarity index 94%
rename from inc/3rdparty/Twig/Error.php
rename to vendor/twig/twig/lib/Twig/Error.php
index 72d91a98bb1aa9cf9b9d9bd075396651824452b6..61a4cfa06bc6606895b154bb5023a9f894be2a58 100644 (file)
--- a/inc/3rdparty/Twig/Error.php
+++ b/vendor/twig/twig/lib/Twig/Error.php
@@ -186,6 +186,7 @@ class Twig_Error extends Exception
     protected function guessTemplateInfo()
     {
         $template = null;
+        $templateClass = null;
 
         if (version_compare(phpversion(), '5.3.6', '>=')) {
             $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS | DEBUG_BACKTRACE_PROVIDE_OBJECT);
@@ -195,8 +196,11 @@ class Twig_Error extends Exception
 
         foreach ($backtrace as $trace) {
             if (isset($trace['object']) && $trace['object'] instanceof Twig_Template && 'Twig_Template' !== get_class($trace['object'])) {
-                if (null === $this->filename || $this->filename == $trace['object']->getTemplateName()) {
+                $currentClass = get_class($trace['object']);
+                $isEmbedContainer = 0 === strpos($templateClass, $currentClass);
+                if (null === $this->filename || ($this->filename == $trace['object']->getTemplateName() && !$isEmbedContainer)) {
                     $template = $trace['object'];
+                    $templateClass = get_class($trace['object']);
                 }
             }
         }