Skip to content

Commit

Permalink
Merge branch '6.3' into 6.4
Browse files Browse the repository at this point in the history
* 6.3:
  [Form] Fix merging form data and files (ter)
  [Intl] Update the ICU data to 74.1
  [Scheduler] Use MockClock
  [HtmlSanitizer] Consider `width` attribute as safe
  [DoctrineBridge] Fix exception message
  [Security][Validator] Missing translations for Luxembourgish
  • Loading branch information
fabpot committed Oct 28, 2023
2 parents 9920830 + 45e5a24 commit 9cc71f2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Reference/W3CReference.php
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ final class W3CReference
'vlink' => false,
'vspace' => true,
'webkitdirectory' => true,
'width' => false,
'width' => true,
'wrap' => true,
];
}
4 changes: 2 additions & 2 deletions Tests/HtmlSanitizerAllTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -427,8 +427,8 @@ public static function provideSanitizeBody()
'<hr />',
],
[
'<img src="/img/example.jpg" alt="Image alternative text" title="Image title">',
'<img src="/img/example.jpg" alt="Image alternative text" title="Image title" />',
'<img src="/img/example.jpg" alt="Image alternative text" title="Image title" height="150" width="300">',
'<img src="/img/example.jpg" alt="Image alternative text" title="Image title" height="150" width="300" />',
],
[
'<img src="http://trusted.com/img/example.jpg" alt="Image alternative text" title="Image title" />',
Expand Down

0 comments on commit 9cc71f2

Please sign in to comment.