Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[5.0] Upmerge 2023-12-12 #42497

Merged
merged 11 commits into from
Dec 12, 2023
Merged

Conversation

bembelimen
Copy link
Contributor

Pull Request for Issue # .

Summary of Changes

Testing Instructions

Actual result BEFORE applying this Pull Request

Expected result AFTER applying this Pull Request

Link to documentations

Please select:

  • Documentation link for docs.joomla.org:

  • No documentation changes for docs.joomla.org needed

  • Pull Request link for manual.joomla.org:

  • No documentation changes for manual.joomla.org needed

MacJoom and others added 11 commits November 18, 2023 15:45
Signed-off-by: Martin Kopp <kopp05@infotech.ch>
This is a security release

## Version 5.10.9 - November 15, 2023
### Changed
- Zero width no-break space (U+FEFF) characters are removed from content passed to setContent, insertContent, and resetContent APIs.
- Zero width no-break space (U+FEFF) characters in initial content are not loaded into the editor upon initialization.
### Fixed
-Specific HTML content containing unescaped text nodes caused mXSS when using undo/redo.
-Specific HTML content containing unescaped text nodes caused mXSS when using the getContent and setContent APIs with the format: 'raw' option, which also affected the resetContent API and the draft restoration feature of the Autosave plugin
Signed-off-by: Martin Kopp <kopp05@infotech.ch>
* Broken language comment

The recent security update has exposed a bug in a language string. You cannot have a " in a comment.

* dont translate images
…40527)

* json_decode of NULL

* Check for name in Installer Script
* Fix error editor not found in contenthistory modal

* cs

* update as required
@joomla-cms-bot joomla-cms-bot added Language Change This is for Translators NPM Resource Changed This Pull Request can't be tested by Patchtester PR-5.0-dev labels Dec 12, 2023
@bembelimen bembelimen enabled auto-merge December 12, 2023 11:36
@bembelimen bembelimen disabled auto-merge December 12, 2023 12:36
@bembelimen bembelimen merged commit bce01c4 into joomla:5.0-dev Dec 12, 2023
@bembelimen bembelimen deleted the 5.0/upmerge-2023-12-12 branch January 23, 2024 00:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Language Change This is for Translators NPM Resource Changed This Pull Request can't be tested by Patchtester
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants