Upmerge 6.2 dev

.github/ISSUE_TEMPLATE/Feature_request.md

@@ -0,0 +1,9 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+Feature requests should **NOT** be submitted as an issue.
+
+The correct place for a feature request is the Discussion area. More in depth information on the feature request process can be found here: https://github.com/joomla/joomla-cms/discussions/46934

.github/workflows/ci.yml

@@ -14,8 +14,8 @@ jobs:
     runs-on: ubuntu-latest
     container: joomlaprojects/docker-images:php8.4
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/cache@v4
+      - uses: actions/checkout@v6
+      - uses: actions/cache@v5
         id: cache-php
         with:
           path: libraries/vendor
@@ -39,18 +39,22 @@ jobs:
     container: joomlaprojects/docker-images:php8.4
     needs: [composer]
     steps:
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
           node-version: latest
-      - uses: actions/checkout@v4
-      - uses: actions/cache@v4
+      - uses: actions/checkout@v6
+      - uses: actions/cache@v5
         id: cache-assets
         with:
           path: |
             node_modules
             media
-          key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json', 'build/media_source/**', 'administrator/components/com_media/resources/**') }}
-      - uses: actions/cache/restore@v4
+            installation/template/css
+            installation/template/images
+            installation/template/js
+            installation/template/scss
+          key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json', 'build/build.mjs', 'build/build-modules-js/**', 'media_source/**') }}
+      - uses: actions/cache/restore@v5
         with:
           path: libraries/vendor
           key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
@@ -71,8 +75,8 @@ jobs:
       matrix:
         command: ['php-cs-fixer fix -vvv --dry-run --diff', 'phpcs --extensions=php -p --standard=ruleset.xml .']
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/cache/restore@v4
+      - uses: actions/checkout@v6
+      - uses: actions/cache/restore@v5
         with:
           path: libraries/vendor
           key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
@@ -94,16 +98,20 @@ jobs:
       matrix:
         check: ['lint:js', 'lint:testjs', 'lint:css']
     steps:
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
           node-version: latest
-      - uses: actions/checkout@v4
-      - uses: actions/cache/restore@v4
+      - uses: actions/checkout@v6
+      - uses: actions/cache/restore@v5
         with:
           path: |
             node_modules
             media
-          key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json', 'build/media_source/**', 'administrator/components/com_media/resources/**') }}
+            installation/template/css
+            installation/template/images
+            installation/template/js
+            installation/template/scss
+          key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json', 'build/build.mjs', 'build/build-modules-js/**', 'media_source/**') }}
       - name: Check code style
         run: npm run ${{ matrix.check }}
 
@@ -113,8 +121,8 @@ jobs:
     container: joomlaprojects/docker-images:php8.4
     needs: [code-style-php]
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/cache/restore@v4
+      - uses: actions/checkout@v6
+      - uses: actions/cache/restore@v5
         with:
           path: libraries/vendor
           key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
@@ -135,8 +143,8 @@ jobs:
       matrix:
         php_version: ['8.3', '8.4', '8.5']
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/cache/restore@v4
+      - uses: actions/checkout@v6
+      - uses: actions/cache/restore@v5
         with:
           path: libraries/vendor
           key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
@@ -181,12 +189,12 @@ jobs:
             host: 'postgres'
             user: 'root'
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Start LDAP container
         uses: docker://docker
         with:
           args: docker run -d --name openldap --network ${{ job.container.network }} --network-alias openldap -e "LDAP_ADMIN_USERNAME=admin" -e "LDAP_ADMIN_PASSWORD=adminpassword" -e "LDAP_USERS=customuser" -e "LDAP_PASSWORDS=custompassword" -e "LDAP_ENABLE_TLS=yes" -e "LDAP_TLS_CERT_FILE=/certs/openldap.crt" -e "LDAP_TLS_KEY_FILE=/certs/openldap.key" -e "LDAP_TLS_CA_FILE=/certs/CA.crt" -e "BITNAMI_DEBUG=true" -e "LDAP_CONFIG_ADMIN_ENABLED=yes" -e "LDAP_CONFIG_ADMIN_USERNAME=admin" -e "LDAP_CONFIG_ADMIN_PASSWORD=configpassword" -v "${{ github.workspace }}/tests/certs/openldap.crt":"/certs/openldap.crt" -v "${{ github.workspace }}/tests/certs/openldap.key":"/certs/openldap.key" -v "${{ github.workspace }}/tests/certs/CA.crt":"/certs/CA.crt" ghcr.io/joomla-projects/mirror-bitnami-openldap:latest
-      - uses: actions/cache/restore@v4
+      - uses: actions/cache/restore@v5
         with:
           path: libraries/vendor
           key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
@@ -238,8 +246,8 @@ jobs:
       matrix:
         php_version: ['8.3', '8.4', '8.5']
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/cache/restore@v4
+      - uses: actions/checkout@v6
+      - uses: actions/cache/restore@v5
         id: cache-php-windows
         with:
           path: libraries/vendor
@@ -269,8 +277,8 @@ jobs:
       matrix:
         php_version: ['8.3', '8.4', '8.5']
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/cache/restore@v4
+      - uses: actions/checkout@v6
+      - uses: actions/cache/restore@v5
         with:
           path: libraries/vendor
           key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
@@ -308,14 +316,18 @@ jobs:
     env:
       CYPRESS_VERIFY_TIMEOUT: 100000
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/cache/restore@v4
+      - uses: actions/checkout@v6
+      - uses: actions/cache/restore@v5
         with:
           path: |
             node_modules
             media
-          key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json', 'build/media_source/**', 'administrator/components/com_media/resources/**') }}
-      - uses: actions/cache@v4
+            installation/template/css
+            installation/template/images
+            installation/template/js
+            installation/template/scss
+          key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json', 'build/build.mjs', 'build/build-modules-js/**', 'media_source/**') }}
+      - uses: actions/cache@v5
         id: cache-cypress
         with:
           path: |
@@ -370,12 +382,12 @@ jobs:
     env:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/cache/restore@v4
+      - uses: actions/checkout@v6
+      - uses: actions/cache/restore@v5
         with:
           path: libraries/vendor
           key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
-      - uses: actions/cache/restore@v4
+      - uses: actions/cache/restore@v5
         with:
           path: plugins/system/webauthn/fido.jwt
           key: ${{ runner.os }}-webauthn-${{ hashFiles('composer.lock') }}
@@ -384,8 +396,12 @@ jobs:
           path: |
             node_modules
             media
-          key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json', 'build/media_source/**', 'administrator/components/com_media/resources/**') }}
-      - uses: actions/cache/restore@v4
+            installation/template/css
+            installation/template/images
+            installation/template/js
+            installation/template/scss
+          key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json', 'build/build.mjs', 'build/build-modules-js/**', 'media_source/**') }}
+      - uses: actions/cache/restore@v5
         with:
           path: |
             /root/.cache/Cypress
@@ -394,7 +410,7 @@ jobs:
       - name: Run System tests
         run: bash tests/System/entrypoint.sh "$(pwd)" ${{ matrix.config.test_group }} ${{ matrix.config.db_engine }} ${{ matrix.config.db_host }} ${{ matrix.browser }}
       - name: Archive test results results
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         if: always()
         with:
           name: system-test-output
@@ -427,7 +443,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout Actions Repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
     - name: Spell Check Repository
       uses: crate-ci/typos@v1.34.0
       with:

.github/workflows/create-translation-pull-request-v5.yml

@@ -26,13 +26,13 @@ jobs:
     if: ${{ github.repository == 'joomla-translation-bot/joomla-cms' && github.ref == 'refs/heads/translation5' }}
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         # We need the full depth to create / update the pull request against the main repo
         with:
           ref: translation5
           fetch-depth: 0
           token: ${{ secrets.PAT_WORKFLOW }}
-      - uses: actions/setup-node@v5
+      - uses: actions/setup-node@v6
         with:
           node-version: 24
 

.github/workflows/create-translation-pull-request-v6.yml

@@ -12,7 +12,7 @@ on:
 
 env:
   JOOMLA_MAJOR_VERSION: 6
-  JOOMLA_MINOR_VERSION: '6.0'
+  JOOMLA_MINOR_VERSION: '6.1'
 
 permissions:
   contents: read
@@ -26,13 +26,13 @@ jobs:
     if: ${{ github.repository == 'joomla-translation-bot/joomla-cms' && github.ref == 'refs/heads/translation6' }}
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         # We need the full depth to create / update the pull request against the main repo
         with:
           ref: translation6
           fetch-depth: 0
-          token: ${{ secrets.PAT_WORKFLOW }}          
-      - uses: actions/setup-node@v5
+          token: ${{ secrets.PAT_WORKFLOW }}
+      - uses: actions/setup-node@v6
         with:
           node-version: 24
 

.gitignore

@@ -26,6 +26,9 @@
 
 # Template CSS files generated by NPM
 /installation/template/css
+/installation/template/images
+/installation/template/js
+/installation/template/scss
 
 # Test Related Files
 /phpunit.xml

administrator/components/com_associations/tmpl/association/edit.php

@@ -42,11 +42,11 @@
                     src="<?php echo Route::_($this->editUri . '&task=' . $this->typeName . '.edit&id=' . (int) $this->referenceId); ?>"
                     height="400" width="400"
                     data-action="edit"
-                    data-item="<?php echo $this->typeName; ?>"
-                    data-id="<?php echo $this->referenceId; ?>"
-                    data-title="<?php echo $this->referenceTitle; ?>"
-                    data-title-value="<?php echo $this->referenceTitleValue; ?>"
-                    data-language="<?php echo $this->referenceLanguage; ?>"
+                    data-item="<?php echo $this->escape($this->typeName); ?>"
+                    data-id="<?php echo $this->escape($this->referenceId); ?>"
+                    data-title="<?php echo $this->escape($this->referenceTitle); ?>"
+                    data-title-value="<?php echo $this->escape($this->referenceTitleValue); ?>"
+                    data-language="<?php echo $this->escape($this->referenceLanguage); ?>"
                     data-editurl="<?php echo Route::_($this->editUri); ?>">
                 </iframe>
             </div>

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

@@ -128,6 +128,9 @@ protected function initializeView()
      */
     protected function addToolbar()
     {
+        if ($this->getLayout() === 'pagebreak') {
+            return;
+        }
         if ($this->getLayout() === 'modal') {
             $this->addModalToolbar();
 

administrator/components/com_fields/src/Model/FieldModel.php

@@ -111,12 +111,30 @@ public function __construct($config = [], ?MVCFactoryInterface $factory = null)
      */
     public function save($data)
     {
-        $field = null;
+        $field                     = null;
+        $hasDuplicateSubformFields = false;
 
         if (isset($data['id']) && $data['id']) {
             $field = $this->getItem($data['id']);
         }
 
+        $fieldType = $data['type'] ?? ($field->type ?? null);
+
+        if ($fieldType === 'subform' && isset($data['fieldparams']['options']) && \is_array($data['fieldparams']['options'])) {
+            $seenCustomFields = [];
+
+            foreach ($data['fieldparams']['options'] as $option) {
+                $customField = (string) ($option['customfield'] ?? '');
+
+                if (isset($seenCustomFields[$customField])) {
+                    $hasDuplicateSubformFields = true;
+                    break;
+                }
+
+                $seenCustomFields[$customField] = true;
+            }
+        }
+
         if (isset($data['params']['searchindex'])) {
             if (\is_null($field)) {
                 if ($data['params']['searchindex'] > 0) {
@@ -172,6 +190,10 @@ public function save($data)
             return false;
         }
 
+        if ($hasDuplicateSubformFields) {
+            Factory::getApplication()->enqueueMessage(Text::_('COM_FIELDS_FIELD_SUBFORM_DUPLICATE_FIELDS_REMOVED'), 'warning');
+        }
+
         // Save the assigned categories into #__fields_categories
         $db = $this->getDatabase();
         $id = (int) $this->getState('field.id');

administrator/components/com_media/tmpl/media/default.php

@@ -12,6 +12,7 @@
 
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
 
@@ -34,6 +35,7 @@
 $tmpl = $input->getCmd('tmpl');
 
 $mediaTypes = '&mediatypes=' . $input->getString('mediatypes', '0,1,2,3');
+$hasMediaActionPlugins = !empty(PluginHelper::getPlugin('media-action'));
 
 // Populate the media config
 $config = [
@@ -54,6 +56,7 @@
     'canCreate'           => $user->authorise('core.create', 'com_media'),
     'canEdit'             => $user->authorise('core.edit', 'com_media'),
     'canDelete'           => $user->authorise('core.delete', 'com_media'),
+    'hasMediaActionPlugins' => $hasMediaActionPlugins,
 ];
 $this->getDocument()->addScriptOptions('com_media', $config);
 ?>

administrator/language/en-GB/com_fields.ini

@@ -67,6 +67,7 @@ COM_FIELDS_FIELD_SHOWLABEL_LABEL="Label"
 COM_FIELDS_FIELD_SHOWON_DESC="Conditionally show or hide the field depending on the value of other fields."
 COM_FIELDS_FIELD_SHOWON_LABEL="Showon Attribute"
 COM_FIELDS_FIELD_SMARTSEARCHOPTIONS_HEADING="Smart Search"
+COM_FIELDS_FIELD_SUBFORM_DUPLICATE_FIELDS_REMOVED="Duplicate subform fields were removed. Each field can only be used once."
 COM_FIELDS_FIELD_SUFFIX_LABEL="Suffix"
 COM_FIELDS_FIELD_TYPE_LABEL="Type"
 COM_FIELDS_FIELD_USE_GLOBAL="Use settings from Plugin"