Merge remote-tracking branch 'upstream/5.4-dev' into upmerges/2025-07-23

Author: Bodge-IT

.github/workflows/typos.toml

@@ -28,7 +28,6 @@ crypted="crypted"           # Used in MD5Handler
 datas="datas"               # Used in showon.es6.js
 deactive="deactive"         # Used in searchtools.es6.js
 exept="exept"               # Used in El.php Greek language stemmer
-fof="fof"                   # To be fixed - outdated code comment in com_postinstall
 Formater="Formater"         # Used in AbstractDataCollector of debug plugin
 hel="hel"                   # Variable name in MenusHelper
 identicals="identicals"     # administrator\components\com_templates\tmpl\template\default.php

administrator/components/com_joomlaupdate/src/Model/UpdateModel.php

@@ -632,7 +632,7 @@ public function changeAutoUpdateRegistration(AutoupdateRegisterState $targetStat
             ($targetState === AutoupdateRegisterState::Subscribe)
                 ? AutoupdateRegisterState::Subscribed
                 : AutoupdateRegisterState::Unsubscribed,
-            ($targetState === AutoupdateRegisterState::Unsubscribed)
+            ($targetState === AutoupdateRegisterState::Subscribe)
         );
 
         return AutoupdateRegisterResultState::Success;

administrator/components/com_postinstall/src/Model/MessagesModel.php

@@ -508,8 +508,7 @@ public function getComponentOptions()
      * enabled             Must be 1 for this message to be enabled. If you omit it, it defaults to 1.
      *
      * condition_file      The RAD path to a PHP file containing a PHP function which determines whether this message should be shown to
-     *                     the user. @see FOFTemplateUtils::parsePath() for RAD path format. Joomla! will include this file before calling
-     *                     the condition_method.
+     *                     the user. Joomla! will include this file before calling the condition_method.
      *                     Example:   admin://components/com_foobar/helpers/postinstall.php
      *
      * condition_method    The name of a PHP function which will be used to determine whether to show this message to the user. This must be

administrator/modules/mod_menu/services/provider.php

@@ -18,7 +18,7 @@
 /**
  * The administrator menu module service provider.
  *
- * @since  6.0.0
+ * @since  5.4.0
  */
 return new class () implements ServiceProviderInterface {
     /**
@@ -28,7 +28,7 @@
      *
      * @return  void
      *
-     * @since   6.0.0
+     * @since   5.4.0
      */
     public function register(Container $container)
     {

administrator/modules/mod_menu/src/Dispatcher/Dispatcher.php

@@ -20,7 +20,7 @@
 /**
  * Dispatcher class for mod_menu
  *
- * @since  6.0.0
+ * @since  5.4.0
  */
 class Dispatcher extends AbstractModuleDispatcher
 {
@@ -29,7 +29,7 @@ class Dispatcher extends AbstractModuleDispatcher
      *
      * @return  array
      *
-     * @since   6.0.0
+     * @since   5.4.0
      */
     protected function getLayoutData()
     {

build/media_source/plg_system_stats/js/stats-message.es6.js

@@ -25,15 +25,6 @@ Joomla = window.Joomla || {};
   const initStatsEvents = (callback) => {
     const messageContainer = document.getElementById('system-message-container');
     const joomlaAlert = messageContainer.querySelector('.js-pstats-alert');
-    const detailsContainer = messageContainer.querySelector('#js-pstats-data-details');
-
-    // Show details about the information being sent
-    document.addEventListener('click', (event) => {
-      if (event.target.classList.contains('js-pstats-btn-details')) {
-        event.preventDefault();
-        detailsContainer.classList.toggle('d-none');
-      }
-    });
 
     // Always allow
     document.addEventListener('click', (event) => {

build/media_source/plg_system_stats/js/stats.es6.js

@@ -7,33 +7,16 @@
   'use strict';
 
   // Selectors used by this script
-  const statsDataTogglerId = 'js-pstats-data-details-toggler';
-  const statsDataDetailsId = 'js-pstats-data-details';
   const resetId = 'js-pstats-reset-uid';
   const uniqueIdFieldId = 'jform_params_unique_id';
 
-  const onToggle = (event) => {
-    event.preventDefault();
-    const element = document.getElementById(statsDataDetailsId);
-
-    if (element) {
-      element.classList.toggle('d-none');
-    }
-  };
-
   const onReset = (event) => {
     event.preventDefault();
     document.getElementById(uniqueIdFieldId).value = '';
     Joomla.submitbutton('plugin.apply');
   };
 
   const onBoot = () => {
-    // Toggle stats details
-    const toggler = document.getElementById(statsDataTogglerId);
-    if (toggler) {
-      toggler.addEventListener('click', onToggle);
-    }
-
     // Reset the unique id
     const reset = document.getElementById(resetId);
     if (reset) {

build/media_source/system/js/core.es6.js

@@ -53,6 +53,8 @@ const DefaultAllowlist = {
   select: ['name'],
   textarea: ['name'],
   option: ['value', 'selected'],
+  details: ['open'],
+  summary: [],
 };
 
 // Only define the Joomla namespace if not defined.

libraries/src/Object/LegacyErrorHandlingTrait.php

@@ -40,7 +40,7 @@ trait LegacyErrorHandlingTrait
      * Use exceptions rather than getError/setError.
      *
      * @var          boolean
-     * @since        6.0.0
+     * @since        5.4.0
      * @deprecated   7.0
      */
     private bool $useExceptions = false;
@@ -123,7 +123,7 @@ public function setError($error)
      *
      * @return  boolean
      *
-     * @since        6.0.0
+     * @since        5.4.0
      * @deprecated   7.0
      */
     public function shouldUseExceptions(): bool
@@ -138,7 +138,7 @@ public function shouldUseExceptions(): bool
      *
      * @return  void
      *
-     * @since        6.0.0
+     * @since        5.4.0
      * @deprecated   7.0
      */
     public function setUseExceptions(bool $value): void

libraries/src/Table/CoreContent.php

@@ -258,7 +258,7 @@ public function store($updateNulls = true)
      * @return  boolean  True on success.
      *
      * @since   3.1
-     * @deprecated  6.0.0 will be removed in 7.0 without replacement
+     * @deprecated  5.4.0 will be removed in 7.0 without replacement
      */
     protected function storeUcmBase($updateNulls = true, $isNew = false)
     {