Feeling Lucky
NPM Resource Changed
PR-6.0-dev
[#47349] - [6.0] Upmerges - 2026-03-10
- Fixed in Code Base
- 10 Mar 2026
- Medium
- Build: 6.0-dev
- # 47349
- Diff
- Bodge-IT:upmerges/2026-03-10
User tests: Successful: Unsuccessful:
Upmerges from 5.4, preserving 6.0 specific fixes.
| Status | New | ⇒ | Pending |
joomla-cms-bot
- | Category | ⇒ | Repository Administration com_admin Modules NPM Change Front End |
| Labels |
Added:
NPM Resource Changed
PR-6.0-dev
|
||
| Category | Repository Administration com_admin Modules NPM Change Front End | ⇒ | Repository Administration Modules NPM Change Front End |
Bodge-IT
- comment
- 10 Mar 2026
@LadySolveig and @richard67 upmerge should be OK now. The changes from the 5.4 fix were automerged by vscode and we missed it. reverted now and text fixed.
richard67
- comment
- 10 Mar 2026
@LadySolveig and @richard67 upmerge should be OK now. The changes from the 5.4 fix were automerged by vscode and we missed it. reverted now and text fixed.
@Bodge-IT No. Your upmerge PR still shows changes for the administrator/modules/mod_menu/tmpl/default_submenu.php file, compared to 6.0-dev. See https://github.com/joomla/joomla-cms/pull/47349/changes
| Status | Pending | ⇒ | Fixed in Code Base |
| Closed_Date | 0000-00-00 00:00:00 | ⇒ | 2026-03-10 17:56:27 |
| Closed_By | ⇒ | Bodge-IT |
@LadySolveig As you have made both PRs, #47268 for 5.4-dev and #47271 for 6.0-dev: Could you check the changes here in the
administrator/modules/mod_menu/tmpl/default_submenu.phpfile?I think @Bodge-IT should have kept the file from 6.0-dev and have ignored all changes from 5.4-dev instead of merging up changes. Now this PR here will partly revert the changes made with PR #46550 in 6.0-dev by @bembelimen .
Or am I wrong?