geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-16 12:26:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

merged branch rrehbeindoi/error-memory (PR #1083)

Browse Source 
This PR was squashed before being merged into the master branch (closes #1083).

Discussion
----------

Adjusted backtrace call to reduce memory usage

Commits
-------

cf3ee20 Adjusted backtrace call to reduce memory usage
This commit is contained in:
Fabien Potencier
2013-05-14 07:05:22 +02:00
parent 9f2cbddc68 cf3ee203a2
commit 7b298c2d1f
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Error.php
+8 -1
View File
@@ -186,7 +186,14 @@ class Twig_Error extends Exception
protected function guessTemplateInfo()
{
$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 (null === $this->filename || $this->filename == $trace['object']->getTemplateName()) {
$template = $trace['object'];