Merge branch '2.7' into 2.8
* 2.7: [Debug] Remove GLOBALS from exception context to avoid endless recursion
This commit is contained in:
commit
9b9f1be117
@ -399,7 +399,7 @@ class ErrorHandler
|
||||
return $type && $log;
|
||||
}
|
||||
|
||||
if (PHP_VERSION_ID < 50400 && isset($context['GLOBALS']) && ($this->scopedErrors & $type)) {
|
||||
if (isset($context['GLOBALS']) && ($this->scopedErrors & $type)) {
|
||||
$e = $context; // Whatever the signature of the method,
|
||||
unset($e['GLOBALS'], $context); // $context is always a reference in 5.3
|
||||
$context = $e;
|
||||
|
Reference in New Issue
Block a user