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

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
This commit is contained in:
Fabien Potencier 2012-12-12 10:42:27 +01:00
commit af7f75f79b

View File

@ -161,7 +161,7 @@ class FlattenException
'short_class' => $class, 'short_class' => $class,
'class' => isset($entry['class']) ? $entry['class'] : '', 'class' => isset($entry['class']) ? $entry['class'] : '',
'type' => isset($entry['type']) ? $entry['type'] : '', 'type' => isset($entry['type']) ? $entry['type'] : '',
'function' => $entry['function'], 'function' => isset($entry['function']) ? $entry['function'] : null,
'file' => isset($entry['file']) ? $entry['file'] : null, 'file' => isset($entry['file']) ? $entry['file'] : null,
'line' => isset($entry['line']) ? $entry['line'] : null, 'line' => isset($entry['line']) ? $entry['line'] : null,
'args' => isset($entry['args']) ? $this->flattenArgs($entry['args']) : array(), 'args' => isset($entry['args']) ? $this->flattenArgs($entry['args']) : array(),