[6.1] Upmerges - 2026-01-30 - #46778
Merged
HLeithner merged 22 commits intoJan 30, 2026
Merged
Conversation
Fixes obvious copy paste error using the wrong language string for an error message
Add null check before converting rules to array
Fix PHP 8.5 null access on array deprecation warning
This fix adds a guard check to safely handle the absence of a filter form and prevent a fatal error.
Make sure the image is displayed AND ensure there are no empty list elements --------- Signed-off-by: BrianTeeman <brian@teeman.net>
When using btn-classes in an alert message, the styling is not everywhere readable. This PR fixes it.
NPM modules patch level updates: - diff from 5.2.0 to 5.2.2 - lodash from 4.17.21 to 4.17.23
…est (joomla#46760) * Adapter should have in install routine always the current manifest * Update libraries/src/Installer/Installer.php
Merge pull request joomla#46763 from Bodge-IT/upmerges/2026-01-28
joomla-cms-bot
added
Language Change
There was a problem hiding this comment.
Pull request overview
Upmerges changes from 6.0-dev into the 6.1 branch, bringing across various robustness fixes, UI/template adjustments, and maintenance tooling updates.
Changes:
- Improves runtime resilience via additional null/default handling (e.g., filter forms, models, language handling).
- Enhances template/archive handling in com_templates (ZipArchive availability checks, safer archive listing).
- Adds maintenance workflow automation and minor UI/asset tweaks (JS/CSS/SCSS, language strings).
Reviewed changes
Copilot reviewed 15 out of 16 changed files in this pull request and generated 5 comments.
Show a summary per file
| File | Description |
|---|---|
| plugins/system/schemaorg/src/Extension/Schemaorg.php | Adds normalization for schema image URLs before adding to @graph. |
| plugins/system/languagefilter/src/Extension/LanguageFilter.php | Adds safer defaults when reading lang and session language values. |
| modules/mod_articles/tmpl/default_items.php | Adjusts markup to avoid emitting empty list items; extends condition to include images. |
| libraries/src/MVC/View/ListView.php | Avoids calling methods on a null filter form. |
| libraries/src/Installer/Installer.php | Ensures cached installer adapters are updated for current manifest/route. |
| libraries/src/Association/AssociationExtensionHelper.php | Fixes docblock type for $extension. |
| installation/language/lt-LT/joomla.cli.ini | Adds missing installer CLI description strings (lt-LT). |
| installation/language/bg-BG/joomla.cli.ini | Adds missing installer CLI description strings (bg-BG). |
| build/media_source/templates/site/cassiopeia/js/mod_menu/menu-metismenu.es6.js | Adjusts MetisMenu click handling and event wiring. |
| build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss | Refines link styling within alerts and avoids styling button links as plain anchors. |
| build/media_source/plg_system_debug/css/debug.css | Adds hover styling for timeline measures (light/dark). |
| administrator/language/en-GB/com_templates.ini | Adds ZipArchive-not-enabled error string. |
| administrator/components/com_users/src/Model/LevelModel.php | Prevents null dereference when getItem() returns falsy. |
| administrator/components/com_templates/tmpl/template/default.php | Guards archive listing rendering when archive is empty/invalid. |
| administrator/components/com_templates/src/Model/TemplateModel.php | Adds ZipArchive availability check and corrects missing-archive error key. |
| .github/workflows/clean-cache.yml | Adds workflow to delete GitHub Actions caches when PRs are closed. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Kostelano
added a commit
to JPathRu/localisation
that referenced
this pull request
May 25, 2026
joomla/joomla-cms#46278 + joomla/joomla-cms#46277 + joomla/joomla-cms#46514 + joomla/joomla-cms#46375 + joomla/joomla-cms#46605 + joomla/joomla-cms#42347 + joomla/joomla-cms#47438 + (upmerge) joomla/joomla-cms#47542 + (upmerge) joomla/joomla-cms#47552 - (только для др. языков) joomla/joomla-cms#47499 - (только для en-GB) joomla/joomla-cms#47537 - (только для др. языков) joomla/joomla-cms#47229 + joomla/joomla-cms#47371 - (только для др. языков) joomla/joomla-cms#47356 + joomla/joomla-cms#47341 + joomla/joomla-cms#47290 + joomla/joomla-cms#45988 + joomla/joomla-cms#47281 - (только для др. языков) joomla/joomla-cms#47234 + joomla/joomla-cms#46438 + joomla/joomla-cms#46916 - (только для др. языков) joomla/joomla-cms#46884 + joomla/joomla-cms#46883 + joomla/joomla-cms#41927 - (только для др. языков) joomla/joomla-cms#46421 + joomla/joomla-cms#46539 + joomla/joomla-cms#46882 + joomla/joomla-cms#46786 + joomla/joomla-cms#45013 + joomla/joomla-cms#46501 + joomla/joomla-cms#46559 + joomla/joomla-cms#46820 + joomla/joomla-cms#46778 + (upmerge) joomla/joomla-cms#45990 + joomla/joomla-cms#46671 +
This file contains hidden or 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
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.
Upmerges from 6.0-dev