Merge branch '5.4-dev' into 6.0-dev-upmerge-2025-09-23

Author: richard67

administrator/components/com_admin/sql/updates/mysql/5.3.4-2025-09-19.sql

@@ -0,0 +1,7 @@
+UPDATE `#__content_types`
+SET `field_mappings` = JSON_SET(`field_mappings`, '$.common.core_created_user_id', 'created_by')
+WHERE `type_alias` = 'com_content.article';
+
+UPDATE `#__content_types`
+SET `field_mappings` = JSON_SET(`field_mappings`, '$.common.core_created_by_alias', 'created_by_alias')
+WHERE `type_alias` = 'com_content.article';

administrator/components/com_admin/sql/updates/postgresql/5.3.4-2025-09-19.sql

@@ -0,0 +1,8 @@
+UPDATE "#__content_types"
+SET "field_mappings" = jsonb_set("field_mappings"::jsonb, '{common, core_created_user_id}' , '"created_by"', true)
+WHERE "type_alias" = 'com_content.article';
+
+UPDATE "#__content_types"
+SET "field_mappings" = jsonb_set("field_mappings"::jsonb, '{common, core_created_by_alias}' , '"created_by_alias"', true)
+WHERE "type_alias" = 'com_content.article';
+

administrator/components/com_admin/src/Model/SysinfoModel.php

@@ -313,19 +313,19 @@ public function &getInfo(): array
         $db = $this->getDatabase();
 
         $this->info = [
+            'version'                => (new Version())->getLongVersion(),
+            'compatpluginenabled'    => PluginHelper::isEnabled('behaviour', 'compat'),
+            'compatpluginparameters' => $this->getCompatPluginParameters(),
+            'phpversion'             => PHP_VERSION,
             'php'                    => php_uname(),
             'dbserver'               => $db->getServerType(),
             'dbversion'              => $db->getVersion(),
             'dbcollation'            => $db->getCollation(),
             'dbconnectioncollation'  => $db->getConnectionCollation(),
             'dbconnectionencryption' => $db->getConnectionEncryption(),
             'dbconnencryptsupported' => $db->isConnectionEncryptionSupported(),
-            'phpversion'             => PHP_VERSION,
             'server'                 => $_SERVER['SERVER_SOFTWARE'] ?? getenv('SERVER_SOFTWARE'),
             'sapi_name'              => PHP_SAPI,
-            'version'                => (new Version())->getLongVersion(),
-            'compatpluginenabled'    => PluginHelper::isEnabled('behaviour', 'compat'),
-            'compatpluginparameters' => $this->getCompatPluginParameters(),
             'useragent'              => $_SERVER['HTTP_USER_AGENT'] ?? '',
         ];
 

administrator/components/com_admin/tmpl/sysinfo/default_system.php

@@ -34,98 +34,99 @@
         <tbody>
             <tr>
                 <th scope="row">
-                    <?php echo Text::_('COM_ADMIN_PHP_BUILT_ON'); ?>
+                    <?php echo Text::_('COM_ADMIN_JOOMLA_VERSION'); ?>
                 </th>
                 <td>
-                    <?php echo $this->info['php']; ?>
+                    <?php echo $this->info['version']; ?>
                 </td>
             </tr>
             <tr>
                 <th scope="row">
-                    <?php echo Text::_('COM_ADMIN_DATABASE_TYPE'); ?>
+                    <?php echo Text::_('COM_ADMIN_JOOMLA_COMPAT_PLUGIN'); ?>
                 </th>
                 <td>
-                    <?php echo $this->info['dbserver']; ?>
+                    <?php echo $this->info['compatpluginenabled'] ? Text::_('JENABLED') . ' (' . $this->info['compatpluginparameters'] . ')' : Text::_('JDISABLED'); ?>
                 </td>
             </tr>
             <tr>
                 <th scope="row">
-                    <?php echo Text::_('COM_ADMIN_DATABASE_VERSION'); ?>
+                    <?php echo Text::_('COM_ADMIN_PHP_VERSION'); ?>
                 </th>
                 <td>
-                    <?php echo $this->info['dbversion']; ?>
+                    <?php echo $this->info['phpversion']; ?>
                 </td>
             </tr>
             <tr>
                 <th scope="row">
-                    <?php echo Text::_('COM_ADMIN_DATABASE_COLLATION'); ?>
+                    <?php echo Text::_('COM_ADMIN_PHP_BUILT_ON'); ?>
                 </th>
                 <td>
-                    <?php echo $this->info['dbcollation']; ?>
+                    <?php echo $this->info['php']; ?>
                 </td>
             </tr>
             <tr>
                 <th scope="row">
-                    <?php echo Text::_('COM_ADMIN_DATABASE_CONNECTION_COLLATION'); ?>
+                    <?php echo Text::_('COM_ADMIN_DATABASE_TYPE'); ?>
                 </th>
                 <td>
-                    <?php echo $this->info['dbconnectioncollation']; ?>
+                    <?php echo $this->info['dbserver']; ?>
                 </td>
             </tr>
             <tr>
                 <th scope="row">
-                    <?php echo Text::_('COM_ADMIN_DATABASE_CONNECTION_ENCRYPTION'); ?>
+                    <?php echo Text::_('COM_ADMIN_DATABASE_VERSION'); ?>
                 </th>
                 <td>
-                    <?php echo $this->info['dbconnectionencryption'] ?: Text::_('JNONE'); ?>
+                    <?php echo $this->info['dbversion']; ?>
                 </td>
             </tr>
             <tr>
                 <th scope="row">
-                    <?php echo Text::_('COM_ADMIN_DATABASE_CONNECTION_ENCRYPTION_SUPPORTED'); ?>
+                    <?php echo Text::_('COM_ADMIN_DATABASE_COLLATION'); ?>
                 </th>
                 <td>
-                    <?php echo $this->info['dbconnencryptsupported'] ? Text::_('JYES') : Text::_('JNO'); ?>
+                    <?php echo $this->info['dbcollation']; ?>
                 </td>
             </tr>
             <tr>
                 <th scope="row">
-                    <?php echo Text::_('COM_ADMIN_PHP_VERSION'); ?>
+                    <?php echo Text::_('COM_ADMIN_DATABASE_CONNECTION_COLLATION'); ?>
                 </th>
                 <td>
-                    <?php echo $this->info['phpversion']; ?>
+                    <?php echo $this->info['dbconnectioncollation']; ?>
                 </td>
             </tr>
             <tr>
                 <th scope="row">
-                    <?php echo Text::_('COM_ADMIN_WEB_SERVER'); ?>
+                    <?php echo Text::_('COM_ADMIN_DATABASE_CONNECTION_ENCRYPTION'); ?>
                 </th>
                 <td>
-                    <?php echo HTMLHelper::_('system.server', $this->info['server']); ?>
+                    <?php echo $this->info['dbconnectionencryption'] ?: Text::_('JNONE'); ?>
                 </td>
             </tr>
             <tr>
                 <th scope="row">
-                    <?php echo Text::_('COM_ADMIN_WEBSERVER_TO_PHP_INTERFACE'); ?>
+                    <?php echo Text::_('COM_ADMIN_DATABASE_CONNECTION_ENCRYPTION_SUPPORTED'); ?>
                 </th>
                 <td>
-                    <?php echo $this->info['sapi_name']; ?>
+                    <?php echo $this->info['dbconnencryptsupported'] ? Text::_('JYES') : Text::_('JNO'); ?>
                 </td>
             </tr>
+
             <tr>
                 <th scope="row">
-                    <?php echo Text::_('COM_ADMIN_JOOMLA_VERSION'); ?>
+                    <?php echo Text::_('COM_ADMIN_WEB_SERVER'); ?>
                 </th>
                 <td>
-                    <?php echo $this->info['version']; ?>
+                    <?php echo HTMLHelper::_('system.server', $this->info['server']); ?>
                 </td>
             </tr>
             <tr>
                 <th scope="row">
-                    <?php echo Text::_('COM_ADMIN_JOOMLA_COMPAT_PLUGIN'); ?>
+                    <?php echo Text::_('COM_ADMIN_WEBSERVER_TO_PHP_INTERFACE'); ?>
                 </th>
                 <td>
-                    <?php echo $this->info['compatpluginenabled'] ? Text::_('JENABLED') . ' (' . $this->info['compatpluginparameters'] . ')' : Text::_('JDISABLED'); ?>
+                    <?php echo $this->info['sapi_name']; ?>
                 </td>
             </tr>
             <tr>

administrator/components/com_menus/presets/alternate.xml

@@ -580,6 +580,13 @@
 			scope="help"
 		/>
 
+		<menuitem
+			title="MOD_MENU_HELP_PROGRAMMERS"
+			type="url"
+			target="_blank"
+			link="https://manual.joomla.org"
+		/>
+
 		<menuitem
 			type="separator"
 		/>

administrator/components/com_menus/presets/help.xml

@@ -31,6 +31,13 @@
 			link="https://docs.joomla.org"
 		/>
 
+		<menuitem
+			title="MOD_MENU_HELP_PROGRAMMERS"
+			type="url"
+			target="_blank"
+			link="https://manual.joomla.org"
+		/>
+
 		<menuitem
 			title="MOD_MENU_HELP_SUPPORT_OFFICIAL_FORUM"
 			type="url"

administrator/components/com_users/src/DataShape/CaptiveRenderOptions.php

@@ -71,8 +71,8 @@ class CaptiveRenderOptions extends DataShapeObject
     /**
      * Attributes other than type and id which will be added to the HTML input box.
      *
-     * @var    array
-     * @@since 4.2.0
+     * @var   array
+     * @since 4.2.0
      */
     protected $input_attributes = [];
 
@@ -185,10 +185,10 @@ protected function setField_type(string $value)
     /**
      * Setter for the input_attributes property.
      *
-     * @param   array  $value  The value to set
+     * @param  array  $value  The value to set
      *
-     * @return  void
-     * @@since  4.2.0
+     * @return void
+     * @since  4.2.0
      */
     // phpcs:ignore
     protected function setInput_attributes(array $value)

administrator/components/com_users/src/DataShape/SetupRenderOptions.php

@@ -114,8 +114,8 @@ class SetupRenderOptions extends DataShapeObject
     /**
      * Attributes other than type and id which will be added to the HTML input box.
      *
-     * @var    array
-     * @@since 4.2.0
+     * @var   array
+     * @since 4.2.0
      */
     protected $input_attributes = [];
 

administrator/language/en-GB/mod_menu.ini

@@ -69,6 +69,7 @@ MOD_MENU_HELP_PARENT_MEET_JOOMLERS="Meet Joomlers"
 MOD_MENU_HELP_PARENT_NEWS="News"
 MOD_MENU_HELP_PARENT_RESOURCES="Resources"
 MOD_MENU_HELP_PARENT_START_HERE="Start Here"
+MOD_MENU_HELP_PROGRAMMERS="Documentation for Joomla! Programmers"
 MOD_MENU_HELP_RESOURCES="Joomla! Resources"
 MOD_MENU_HELP_SECURITY="Security Centre"
 MOD_MENU_HELP_SHOP="Joomla! Shop"

build/media_source/system/js/joomla-dialog.w-c.es6.js

@@ -116,6 +116,8 @@ class JoomlaDialog extends HTMLElement {
     this.preferredParent = null;
     // @internal. Parent of the popupContent for cases when it is HTMLElement. Need for recovery on destroy().
     this.popupContentSrcLocation = null;
+    // @internal. Hold properties addressed directly to <dialog> element, like "aria-".
+    this.dialogProps = {};
 
     if (!config) return;
 
@@ -127,6 +129,13 @@ class JoomlaDialog extends HTMLElement {
       }
     });
 
+    // Check for properties which should be applied to the <dialog> not to the <JoomlaDialog>, like "aria-".
+    ['ariaLabelledby', 'ariaLabel'].forEach((key) => {
+      if (config[key] !== undefined) {
+        this.dialogProps[key] = config[key];
+      }
+    });
+
     // Check class name
     if (config.className) {
       this.classList.add(...config.className.split(' '));
@@ -191,6 +200,11 @@ class JoomlaDialog extends HTMLElement {
     this.dialog.addEventListener('close', onClose);
     this.appendChild(this.dialog);
 
+    // Apply dialog properties if any
+    Object.entries(this.dialogProps).forEach(([k, v]) => {
+      this.dialog[k] = v;
+    });
+
     // Get template parts
     this.popupTmplH = this.dialog.querySelector('.joomla-dialog-header');
     this.popupTmplB = this.dialog.querySelector('.joomla-dialog-body');
@@ -214,6 +228,11 @@ class JoomlaDialog extends HTMLElement {
         i.classList.add(...this.iconHeader.split(' '));
         this.popupTmplH.insertAdjacentElement('afterbegin', i);
       }
+
+      // Set aria-label if it is still missing
+      if (!this.dialog.ariaLabel) {
+        this.dialog.ariaLabel = this.textHeader;
+      }
     }
 
     // Set the body