Skip to content

Commit eb05322

Browse files
Merge branch '6.4' into 7.0
* 6.4: (31 commits) [HttpKernel] Strip exception file paths from log messages [Validator] Add ability to validate time without seconds [Process] Fix test case [Process] Support finding executables independently of open_basedir [Mime] Update mimetypes Add some PHPDoc [Workflow] Add a profiler [Form] Removing self-closing slash from `<input>` [FrameworkBundle][Serializer] Add TranslatableNormalizer [Uid] Fix example [HttpKernel] Add `reset()` implementation in DataCollector [Uid] Add more PHP doc to "export" functions [HttpKernel] RequestPayloadValueResolver Add support for custom http status code [Serializer] Add support for seld/jsonlint in order to enhance error messages [Workflow] fix MermaidDumper when place contains special char [Translation] Phrase translation provider [Workflow] Add support for storing the marking in a property [Crawler] Fix regression where cdata nodes will return empty string [Scheduler] make `ScheduledStamp` "send-able" [Serializer] Groups annotation/attribute on class ...
2 parents 532b776 + b055ffa commit eb05322

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Resources/views/error.html.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
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>
77
<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>

Resources/views/exception_full.html.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
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>
99
<link rel="icon" type="image/png" href="<?= $this->include('assets/images/favicon.png.base64'); ?>">
1010
<style><?= $this->include('assets/css/exception.css'); ?></style>

0 commit comments

Comments
 (0)