[#48226] - [6.1] Upmerge 2026-08-10
- Fixed in Code Base
- 10 Aug 2026
- Medium
- Build: 6.1-dev
- # 48226
- Diff
- richard67:6.1-dev-upmerge-2026-08-09
User tests: Successful: Unsuccessful:
Pull Request resolves # .
- I read the Generative AI policy and my contribution is either not created with the help of AI or is compatible with the policy and GNU/GPL 2 or later.
Summary of Changes
Merge up latest changes from 5.4-dev.
There was one merge conflict which was a bit special. It was caused by PRs #48038 and #48171 here:
https://github.com/joomla/joomla-cms/pull/48226/changes#diff-7524be4124b92e80b90e9799bcee2c6c046808ec4c6621e8f6428b19521c77f5R1402
The resolution for that was to bring both changes together, i.e. not simply use one of the 2 changes but combine them.
Testing Instructions
Review.
Actual result BEFORE applying this Pull Request
6.1-dev branch 19 commits behind 5.4-dev.
Expected result AFTER applying this Pull Request
6.1-dev branch up to date with 5.4-dev.
Link to documentations
Please select:
-
Documentation link for guide.joomla.org:
-
No documentation changes for guide.joomla.org needed
-
Pull Request link for manual.joomla.org:
-
No documentation changes for manual.joomla.org needed
| Status | New | ⇒ | Pending |
joomla-cms-bot
- | Category | ⇒ | Administration com_categories com_contact com_finder com_joomlaupdate com_menus com_modules com_plugins com_templates Language & Strings JavaScript Repository NPM Change Layout Libraries Front End Plugins Templates (site) Unit Tests |
HLeithner
- | Status | Pending | ⇒ | Fixed in Code Base |
| Closed_Date | 0000-00-00 00:00:00 | ⇒ | 2026-08-10 13:31:51 |
| Closed_By | ⇒ | HLeithner | |
| Labels |
Added:
Unit/System Tests
Language Change
NPM Resource Changed
PR-6.1-dev
|
||