[#48332] - [6.1] Upmerge 2026-08-27
- Fixed in Code Base
- 1 Sep 2026
- Medium
- Build: 6.1-dev
- # 48332
- Diff
- tecpromotion:6.1/maint/upmerge-260827
User tests: Successful: Unsuccessful:
Upmerges from 5.4-dev
| Status | New | ⇒ | Pending |
joomla-cms-bot
- | Category | ⇒ | Repository SQL Administration com_admin Postgresql com_categories com_installer com_templates Language & Strings JavaScript NPM Change com_tags Front End Installation Libraries Modules Plugins Unit Tests |
![avatar github-actions[bot]](/images/avatars/github-actions[bot].png)
| Labels |
Added:
Unit/System Tests
Language Change
NPM Resource Changed
PR-6.1-dev
|
||
@tecpromotion It is not enough to remove the 5.4 update SQL files. You need to add 6.1 update SQL files so older 6.1.x versions get that new table column created (if it does not exist yet, what would be caught by the /** CAN FAIL **/).
Unfortunately we will then have 2 sets of update SQL scripts in 6.2, 1 for 6.1 and one for 6.2, because the corresponding merged PR was a backport from 6.2-dev. But the one for 6.1 is still needed, as said.
@tecpromotion It is not enough to remove the 5.4 update SQL files. You need to add 6.1 update SQL files so older 6.1.x versions get that new table column created (if it does not exist yet, what would be caught by the /** CAN FAIL **/).
Unfortunately we will then have 2 sets of update SQL scripts in 6.2, 1 for 6.1 and one for 6.2, because the corresponding merged PR was a backport from 6.2-dev. But the one for 6.1 is still needed, as said.
Update: Has been fixed with commit fb3210a .
| Category | Repository SQL Administration com_admin Postgresql com_categories com_installer com_templates Language & Strings JavaScript NPM Change com_tags Front End Installation Libraries Modules Plugins Unit Tests | ⇒ | Repository SQL Administration com_admin Postgresql com_categories com_fields com_finder com_installer com_tags com_templates Language & Strings Modules JavaScript NPM Change Front End com_content Installation Libraries |
Re the "Note for Release Managers" in #48144: no adjustment needed here — the com_finder Index toolbar is identical in 5.4 and 6.1 and #toolbar-indexing-group only exists with JDEBUG enabled, so #toolbar-index > button stays as merged (verified locally against DDEV, Index.cy.js 3/3 green).
| Labels |
Removed:
Unit/System Tests
|
||
| Status | Pending | ⇒ | Fixed in Code Base |
| Closed_Date | 0000-00-00 00:00:00 | ⇒ | 2026-09-01 09:34:17 |
| Closed_By | ⇒ | HLeithner |
@tecpromotion It is not enough to remove the 5.4 update SQL files. You need to add 6.1 update SQL files so older 6.1.x versions get that new table column created (if it does not exist yet, what would be caught by the
/** CAN FAIL **/.Unfortunately we will then have 2 sets of update SQL scripts in 6.2, 1 for 6.1 and one for 6.2, because the corresponding merged PR was a backport from 6.2-dev. But the one for 6.1 is still needed, as said.