merged branch bamarni/patch-14 (PR #6273)

fabpot · fabpot · commit af7f75f79b91 · 2012-12-12T10:42:27.000+01:00
This PR was submitted for the master branch but it was merged into the 2.0 branch instead (closes #6273). Commits ------- 9273b62 [HttpKernel] checked for a potentially missing key Discussion ---------- [HttpKernel] checked for a potentially missing key
diff --git a/src/Symfony/Component/HttpKernel/Exception/FlattenException.php b/src/Symfony/Component/HttpKernel/Exception/FlattenException.php
@@ -161,7 +161,7 @@ public function setTrace($trace, $file, $line)
                 'short_class' => $class,
                 'class'       => isset($entry['class']) ? $entry['class'] : '',
                 'type'        => isset($entry['type']) ? $entry['type'] : '',
-                'function'    => $entry['function'],
+                'function'    => isset($entry['function']) ? $entry['function'] : null,
                 'file'        => isset($entry['file']) ? $entry['file'] : null,
                 'line'        => isset($entry['line']) ? $entry['line'] : null,
                 'args'        => isset($entry['args']) ? $this->flattenArgs($entry['args']) : array(),
