Skip to content

Commit 9441608

Browse files
Merge branch '6.4' into 7.0
* 6.4: (21 commits) [ErrorHandler] Add missing self-closing tags on link elements Fix merge (bis) Fix merge Add missing return type [FrameworkBundle] ConfigBuilderCacheWarmer should be non-optional [HttpClient] Fix pausing responses before they start when using curl [Notifier] Updated the NTFY notifier to run without a user parameter [Translation] Fix constant domain resolution in PhpAstExtractor separate child and parent context in NotificationEmail on writes [Mailer] [Mailgun] Fix sender header encoding do not overwrite the cache key when it is false [Mailer] [Scaleway] Fix attachment handling [Mailer] Throw TransportException when unable to read from socket [Serializer] Rewrite `AbstractObjectNormalizer::createChildContext()` to use the provided `cache_key` from original context when creating child contexts Revert #47715 [HttpClient] Fix error chunk creation in passthru Adjusting and removing the 'review' attribute from the pt_br translation XML. [DependencyInjection] Fix loading all env vars from secrets when only a subset is needed Fix option filenameMaxLength to the File constraint (Image) [Serializer] Take unnamed variadic parameters into account when denormalizing ...
2 parents 0437061 + 6dc3c76 commit 9441608

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

Resources/views/error.html.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4-
<meta charset="<?= $this->charset; ?>">
5-
<meta name="robots" content="noindex,nofollow,noarchive">
4+
<meta charset="<?= $this->charset; ?>" />
5+
<meta name="robots" content="noindex,nofollow,noarchive" />
66
<title>An Error Occurred: <?= $statusText; ?></title>
7-
<link rel="icon" href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 128 128%22><text y=%221.2em%22 font-size=%2296%22>❌</text></svg>">
7+
<link rel="icon" href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 128 128%22><text y=%221.2em%22 font-size=%2296%22>❌</text></svg>" />
88
<style><?= $this->include('assets/css/error.css'); ?></style>
99
</head>
1010
<body>

Resources/views/exception_full.html.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<!DOCTYPE html>
33
<html lang="en">
44
<head>
5-
<meta charset="<?= $this->charset; ?>">
6-
<meta name="robots" content="noindex,nofollow">
7-
<meta name="viewport" content="width=device-width,initial-scale=1">
5+
<meta charset="<?= $this->charset; ?>" />
6+
<meta name="robots" content="noindex,nofollow" />
7+
<meta name="viewport" content="width=device-width,initial-scale=1" />
88
<title><?= $_message; ?></title>
9-
<link rel="icon" type="image/png" href="<?= $this->include('assets/images/favicon.png.base64'); ?>">
9+
<link rel="icon" type="image/png" href="<?= $this->include('assets/images/favicon.png.base64'); ?>" />
1010
<style><?= $this->include('assets/css/exception.css'); ?></style>
1111
<style><?= $this->include('assets/css/exception_full.css'); ?></style>
1212
</head>

0 commit comments

Comments
 (0)