Merge remote-tracking branch 'upstream/5.4-dev' into upmerges/2025-11-29

Author: Bodge-IT

README.md

@@ -74,6 +74,21 @@ Do you want to improve Joomla?
 * Documentation for [Web designers](https://docs.joomla.org/Special:MyLanguage/Web_designers).
 * Provide a translation for Joomla: [Joomla Crowdin Project](https://joomla.crowdin.com/cms)
 
+Which branch should my Pull Request target?
+--------------------
+Using a simple classification keeps the project **stable**, **transparent**, and **easy** for everyone to contribute.
+
+| Type of change | What it means | Target branch |
+|---|---|---|
+| **Bug / Patch release** | The change fixes an actual error. The software crashes, produces the wrong result, or behaves contrary to its specification. It can be resolved without large‑scale refactoring or new functionality. | **[5.4-dev](https://github.com/joomla/joomla-cms/tree/5.4-dev)** (6.0-dev) **\*** |
+| **Feature / Minor release** | Anything that isn’t a strict bug – new behavior, refactoring, performance improvements, enhancements, UI tweaks, etc. These changes are bundled together for the next minor version. | **[6.1-dev](https://github.com/joomla/joomla-cms/tree/6.1-dev)** |
+
+**\*** All bugs that already exist in version 5.4.x should be fixed in `5.4-dev`. Only bugs that are introduced for the first time in version 6.0.x should target the [`6.0-dev`](https://github.com/joomla/joomla-cms/tree/6.0-dev) branch.
+
+A member of the maintainer or bug squad team confirms the classification and sets the appropriate labels when a PR is opened. If a PR is opened in the wrong branch, a maintainer will simply ask you to retarget it to the proper branch.
+
+
+
 Copyright
 ---------------------
 * (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>

administrator/components/com_actionlogs/src/Controller/ActionlogsController.php

@@ -110,7 +110,7 @@ public function exportLogs()
             $output = fopen("php://output", "w");
 
             foreach ($rows as $row) {
-                fputcsv($output, $row, $csvDelimiter);
+                fputcsv($output, $row, $csvDelimiter, escape: "");
             }
 
             fclose($output);

administrator/components/com_content/src/View/Articles/HtmlView.php

@@ -203,7 +203,7 @@ protected function addToolbar()
                     ->buttonClass('text-center py-2 h3');
 
                 $cmd      = "Joomla.submitbutton('articles.runTransition');";
-                $messages = "{error: [Joomla.JText._('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST')]}";
+                $messages = "{error: [Joomla.Text._('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST')]}";
                 $alert    = 'Joomla.renderMessages(' . $messages . ')';
                 $cmd      = 'if (document.adminForm.boxchecked.value == 0) { ' . $alert . ' } else { ' . $cmd . ' }';
 

administrator/components/com_content/src/View/Featured/HtmlView.php

@@ -72,7 +72,7 @@ public static function getLinkKey($request)
         if (\is_string($request)) {
             $args = [];
 
-            if (str_starts_with($request, 'index.php')) {
+            if (str_starts_with($request, 'index.php?')) {
                 parse_str(parse_url(htmlspecialchars_decode($request), PHP_URL_QUERY), $args);
             } else {
                 parse_str($request, $args);

administrator/components/com_menus/src/Helper/MenusHelper.php

@@ -291,8 +291,7 @@
 @if $enable-dark-mode {
   @include color-mode(dark) {
     .sidebar-wrapper {
-      border: 1px solid rgba(255, 255, 255, .05);
-      box-shadow: none;
+      --atum-box-shadow: 1px 0 0 0 rgba(255, 255, 255, .05);
       .main-nav {
         .badge {
           color: map-get($atum-colors-dark, "btn-primary-color");

build/media_source/templates/administrator/atum/scss/blocks/_sidebar.scss

@@ -193,8 +193,7 @@
   @include color-mode(dark) {
     .com_cpanel {
       .card {
-        border: 1px solid rgba(255, 255, 255, .1);
-        box-shadow: 1px 1px 2px rgba(0, 0, 0, .1);
+        box-shadow: 0 0 0 1px rgba(255, 255, 255, .1), 1px 1px 2px rgba(0, 0, 0, .1);
 
         .list-group-item:last-child {
           border-end-end-radius: var(--border-radius);

build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss

@@ -27,7 +27,7 @@
     CMSApplication::MSG_NOTICE    => 'info',
     CMSApplication::MSG_INFO      => 'info',
     CMSApplication::MSG_DEBUG     => 'info',
-    'message'                     => 'success'
+    CMSApplication::MSG_MESSAGE   => 'success'
 ];
 
 // Load JavaScript message titles

layouts/joomla/system/message.php

@@ -92,6 +92,22 @@ interface CMSApplicationInterface extends ExtensionManagerInterface, Configurati
      */
     public const MSG_DEBUG = 'debug';
 
+    /**
+     * Constant defining an enqueued message message
+     *
+     * @var    string
+     * @since  __DEPLOY_VERSION__
+     */
+    public const MSG_MESSAGE = 'message';
+
+    /**
+     * Constant defining an enqueued success message
+     *
+     * @var    string
+     * @since  __DEPLOY_VERSION__
+     */
+    public const MSG_SUCCESS = 'success';
+
     /**
      * Enqueue a system message.
      *

libraries/src/Application/CMSApplicationInterface.php

@@ -209,14 +209,15 @@ protected function doExecute(): int
             self::MSG_EMERGENCY => 'caution',
             self::MSG_ERROR     => 'error',
             self::MSG_INFO      => 'note',
+            self::MSG_MESSAGE   => 'success', // consistent with joomla.system.message layout
             self::MSG_NOTICE    => 'note',
+            self::MSG_SUCCESS   => 'success',
             self::MSG_WARNING   => 'warning',
         ];
 
         // Output any enqueued messages before the app exits
         foreach ($this->getMessageQueue() as $type => $messages) {
             $method = $methodMap[$type] ?? 'comment';
-
             $style->$method($messages);
         }