Skip to content

Commit f4b60cb

Browse files
Merge branch '6.1' into 6.2
* 6.1: [HttpKernel] Fix test sensitivity on xdebug.file_link_format [HttpKernel] Fix non-scalar check in surrogate fragment renderer [HtmlSanitizer] Allow null for sanitizer option `allowed_link_hosts` and `allowed_media_hosts` [Serializer] Fix wrong needsNormalization in TraceableEncoder [Debug][ErrorHandler] fix operator precedence [Cache] Ensured that redis adapter can use multiple redis sentinel hosts [DoctrineBridge] fix tests [Security] Allow redirect after login to absolute URLs
2 parents 430103a + 736e42d commit f4b60cb

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

ErrorHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ public function screamAt(int $levels, bool $replace = false): int
359359
*/
360360
private function reRegister(int $prev): void
361361
{
362-
if ($prev !== $this->thrownErrors | $this->loggedErrors) {
362+
if ($prev !== ($this->thrownErrors | $this->loggedErrors)) {
363363
$handler = set_error_handler('is_int');
364364
$handler = \is_array($handler) ? $handler[0] : null;
365365
restore_error_handler();

0 commit comments

Comments
 (0)