Adjusted backtrace call to reduce memory usage

This commit is contained in:
Ray
2013-05-10 12:08:06 -05:00
committed by Fabien Potencier
parent 4a49a3ae30
commit cf3ee203a2
+8 -1
View File
@@ -186,7 +186,14 @@ class Twig_Error extends Exception
protected function guessTemplateInfo() protected function guessTemplateInfo()
{ {
$template = null; $template = null;
foreach (debug_backtrace() as $trace) {
if (version_compare(phpversion(), '5.3.6', '>=')) {
$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS | DEBUG_BACKTRACE_PROVIDE_OBJECT);
} else {
$backtrace = debug_backtrace();
}
foreach ($backtrace as $trace) {
if (isset($trace['object']) && $trace['object'] instanceof Twig_Template && 'Twig_Template' !== get_class($trace['object'])) { if (isset($trace['object']) && $trace['object'] instanceof Twig_Template && 'Twig_Template' !== get_class($trace['object'])) {
if (null === $this->filename || $this->filename == $trace['object']->getTemplateName()) { if (null === $this->filename || $this->filename == $trace['object']->getTemplateName()) {
$template = $trace['object']; $template = $trace['object'];