Merge up from 4 to 5 #10651
Merged
Merge up from 4 to 5 #10651
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
….11/cve-2022-38724-embed-shortcode Restrict embed shortcode attributes
….11/cve-2022-38462 Don't allow CRLF in header values
….11/cve-2022-37430 Sanitise mixed case javascript
….10/cve-2022-38148 Validate SortColumn exists
…pulls/runtemplate-fix
…rstripe#10593) Co-authored-by: Michal Kleiner <[email protected]>
* ENH: saveInto() new extension points.
…/deprecate-html5 API Deprecate HTML4Value
| /** | ||
| * Sanitise header values to avoid possible XSS vectors | ||
| */ | ||
| private function sanitiseHeader(string $value): string |
There was a problem hiding this comment.
This method is new from 4 and was conflicting with the strongly typed parameters of redirect in 5
| @@ -16,6 +16,7 @@ | |||
| use SilverStripe\View\Parsers\ShortcodeHandler; | |||
| use SilverStripe\View\Parsers\ShortcodeParser; | |||
| use SilverStripe\Control\Director; | |||
| use SilverStripe\Core\Config\Configurable; | |||
There was a problem hiding this comment.
There was a use use SilverStripe\Dev\Deprecation; statement here that was causing a conflict.
|
You mention |
GuySartorelli
approved these changes
Jan 18, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Just did a merge up from the 4 branch to the 5 branch.
Normally I would just push directly to the branch, but there's enough merge conflicts to resolve that it's probably worth doing an actual peer review.
The following files had conflicts.