[5.4] upmerge 2025-08-05

build/media_source/templates/administrator/atum/scss/_variables-dark.scss

@@ -284,6 +284,7 @@ $atum-colors-dark: (
   btn-secondary-bg:                      $info-dark,
   btn-secondary-border:                  1px solid color.adjust($info-dark, $lightness: 10%),
   btn-secondary-bg-hvr:                  color.adjust($info-dark, $lightness: -10%),
+  btn-secondary-color-hvr:               var(--template-text-light),
   btn-secondary-border-hvr:              1px solid color.adjust($info-dark, $lightness: 10%),
 
   btn-dark-border:                     1px solid rgba(0,0,0,.85),

build/media_source/templates/administrator/atum/scss/_variables.scss

@@ -339,6 +339,8 @@ $atum-colors: (
   btn-secondary-bg:                 var(--template-bg-dark-60),
   btn-secondary-border:             1px solid var(--template-bg-dark-60),
   btn-secondary-color:              var(--template-text-light),
+  btn-secondary-bg-hvr:             var(--template-bg-dark-70),
+  btn-secondary-color-hvr:          var(--template-text-light),
 
   btn-info-color:                   var(--template-text-light),
   btn-info-bg:                      $info,

build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_buttons.scss

@@ -54,8 +54,8 @@
   border: var(--btn-secondary-border);
 
   &:hover {
-    color: var(--btn-secondary-color-hvr);
-    background: var(--btn-secondary-bg-hvr);
+    color: var(--btn-secondary-color-hvr, var(--btn-secondary-color));
+    background: var(--btn-secondary-bg-hvr, var(--template-bg-dark-70));
   }
 }
 

libraries/src/Dispatcher/ComponentDispatcher.php

@@ -171,7 +171,7 @@ public function getController(string $name, string $client = '', array $config =
 
         // Check if the controller could be created
         if (!$controller) {
-            throw new \InvalidArgumentException(Text::sprintf('JLIB_APPLICATION_ERROR_INVALID_CONTROLLER_CLASS', $name));
+            throw new \InvalidArgumentException(Text::sprintf('JLIB_APPLICATION_ERROR_INVALID_CONTROLLER_CLASS', $name), 404);
         }
 
         return $controller;

libraries/src/Versioning/VersionableModelTrait.php

@@ -79,6 +79,11 @@ public function loadHistory($versionId, Table $table)
             $table->load($rowArray[$key]);
         }
 
+        // Fix null ordering when restoring history
+        if (\array_key_exists('ordering', $rowArray) && $rowArray['ordering'] === null) {
+            $rowArray['ordering'] = 0;
+        }
+
         return $table->bind($rowArray);
     }
 }

libraries/src/Versioning/Versioning.php

@@ -123,6 +123,17 @@ public static function store($typeAlias, $id, $data, $note = '')
             Factory::getApplication()->getDispatcher()->dispatch('onContentVersioningPrepareTable', $event);
         }
 
+        // Fix for null ordering - set to 0 if null
+        if (\is_object($data)) {
+            if (property_exists($data, 'ordering') && $data->ordering === null) {
+                $data->ordering = 0;
+            }
+        } elseif (\is_array($data)) {
+            if (\array_key_exists('ordering', $data) && $data['ordering'] === null) {
+                $data['ordering'] = 0;
+            }
+        }
+
         $historyTable->version_data = json_encode($data);
         $historyTable->version_note = $note;
 

plugins/system/debug/src/Extension/Debug.php

@@ -344,11 +344,12 @@ public function onAfterRespond(AfterRespondEvent|ApplicationEvent $event): void
         }
 
         $debugBarRenderer = new JavascriptRenderer($this->debugBar, Uri::root(true) . '/media/vendor/debugbar/');
-        $openHandlerUrl   = Uri::base(true) . '/index.php?option=com_ajax&plugin=debug&group=system&format=raw&action=openhandler';
-        $openHandlerUrl .= '&' . ($formToken ?? Session::getFormToken()) . '=1';
-
-        $debugBarRenderer->setOpenHandlerUrl($openHandlerUrl);
 
+        if ($this->params->get('track_request_history', false)) {
+            $openHandlerUrl   = Uri::base(true) . '/index.php?option=com_ajax&plugin=debug&group=system&format=raw&action=openhandler';
+            $openHandlerUrl .= '&' . ($formToken ?? Session::getFormToken()) . '=1';
+            $debugBarRenderer->setOpenHandlerUrl($openHandlerUrl);
+        }
         /**
          * @todo disable highlightjs from the DebugBar, import it through NPM
          *       and deliver it through Joomla's API

plugins/system/languagefilter/src/Extension/LanguageFilter.php

@@ -699,6 +699,17 @@ public function onUserLogin(LoginEvent $event): void
                             $app->setUserState('users.login.form.return', 'index.php?Itemid=' . $associationItemid);
                             $foundAssociation = true;
                         }
+                    } elseif ($this->mode_sef) {
+                        if ($app->getUserState('users.login.form.return')) {
+                            $app->setUserState(
+                                'users.login.form.return',
+                                Route::_(
+                                    $app->getUserState('users.login.form.return'),
+                                    false
+                                )
+                            );
+                            $foundAssociation = true;
+                        }
                     } elseif (isset($associations[$lang_code]) && $menu->getItem($associations[$lang_code])) {
                         /**
                          * The login form does not contain a menu item redirection.

tests/System/integration/site/components/com_config/Templates.cy.js

@@ -1,4 +1,4 @@
-describe('Test in frontend that the config config view', () => {
+describe('Test in frontend that the config templates view', () => {
   beforeEach(() => cy.doFrontendLogin());
 
   it('can edit template settings without menu item', () => {