Merge branch '5.1-dev' into patch-1

joomla · Jul 3, 2024 · e5a05d5 · e5a05d5
2 parents fd1f6c5 + 870486c
commit e5a05d5
Show file tree

Hide file tree

Showing 111 changed files with 3,536 additions and 229 deletions.
diff --git a/README.md b/README.md
@@ -1,9 +1,6 @@
 Joomla! CMS™
 ====================
 
-The Joomla! 5.1 branch is under heavy development and not all links in this document are available yet
-------------------------------------------------------------------------------------------------------
-
 Build Status
 ---------------------
 | Drone-CI                                                                                                                                 | AppVeyor                                                                                                                                                           | PHP                                                                           | Node                                                                                 | npm                                                                             |

diff --git a/README.txt b/README.txt
@@ -1,8 +1,5 @@
 Joomla! CMS™
 
-The Joomla! 5.1 branch is under heavy development and not all links in this document are available yet
-------------------------------------------------------------------------------------------------------
-
 1- Overview
 	* This is a Joomla! 5.x installation/upgrade package.
 	* Joomla! Official site: https://www.joomla.org

diff --git a/administrator/components/com_associations/src/Helper/AssociationsHelper.php b/administrator/components/com_associations/src/Helper/AssociationsHelper.php
@@ -72,7 +72,7 @@ public static function getAssociationList($extensionName, $typeName, $itemId)
     }
 
     /**
-     * Get the the instance of the extension helper class
+     * Get the instance of the extension helper class
      *
      * @param   string  $extensionName  The extension name with com_
      *

diff --git a/administrator/components/com_installer/src/Model/DatabaseModel.php b/administrator/components/com_installer/src/Model/DatabaseModel.php
@@ -527,7 +527,7 @@ public function compareUpdateVersion($extension)
     /**
      * Get a message of the tables skipped and checked
      *
-     * @param   array  $status  status of of the update files
+     * @param   array  $status  status of the update files
      *
      * @return  array  Messages with the errors with the update version
      *

diff --git a/...istrator/components/com_media/resources/scripts/components/modals/create-folder-modal.vue b/...istrator/components/com_media/resources/scripts/components/modals/create-folder-modal.vue
@@ -80,7 +80,7 @@ export default {
     },
   },
   methods: {
-    /* Check if the the form is valid */
+    /* Check if the form is valid */
     isValid() {
       return (this.folder);
     },

diff --git a/administrator/components/com_menus/src/Model/ItemModel.php b/administrator/components/com_menus/src/Model/ItemModel.php
@@ -1128,7 +1128,7 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
                     ];
                     $metaPath = Path::find($metadataFolders, 'metadata.xml');
 
-                    if (is_file($path = Path::clean($metaPath))) {
+                    if ($metaPath !== false && is_file($path = Path::clean($metaPath))) {
                         $formFile = $path;
                     }
                 } elseif ($base) {

diff --git a/administrator/components/com_messages/src/Field/UserMessagesField.php b/administrator/components/com_messages/src/Field/UserMessagesField.php
@@ -78,7 +78,7 @@ protected function getGroups()
     /**
      * Method to get the users to exclude from the list of users
      *
-     * @return  array|null array of users to exclude or null to to not exclude them
+     * @return  array|null array of users to exclude or null to not exclude them
      *
      * @since   1.6
      */

diff --git a/administrator/language/en-GB/plg_content_pagenavigation.ini b/administrator/language/en-GB/plg_content_pagenavigation.ini
@@ -4,6 +4,7 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_CONTENT_PAGENAVIGATION="Content - Page Navigation"
+PLG_PAGENAVIGATION_ARIA_LABEL="Page Navigation"
 PLG_PAGENAVIGATION_FIELD_DISPLAY_LABEL="Link Text"
 PLG_PAGENAVIGATION_FIELD_POSITION_LABEL="Position"
 PLG_PAGENAVIGATION_FIELD_RELATIVE_LABEL="Relative To"

diff --git a/administrator/language/en-GB/plg_editors_tinymce.ini b/administrator/language/en-GB/plg_editors_tinymce.ini
@@ -96,4 +96,6 @@ PLG_TINY_TOOLBAR_BUTTON_FONTSIZESELECT="Font Size Select"
 PLG_TINY_TOOLBAR_BUTTON_FORMATSELECT="Format Select"
 PLG_TINY_TOOLBAR_BUTTON_SEPARATOR="Separator"
 PLG_TINY_TOOLBAR_BUTTON_STYLESELECT="Style Select"
+PLG_TINY_FIELD_SANDBOX_IFRAMES_LABEL="Sandbox Iframes"
+PLG_TINY_FIELD_SANDBOX_IFRAMES_DESC="This is a security feature that restricts what the iframe can do by setting a sandbox attribute for each iframe. It is recommended to enable this feature for security reasons. Only disable if the iframe is not loading and you're sure that the iframed content is safe."
 PLG_TINY_XML_DESCRIPTION="TinyMCE is a platform independent web based JavaScript HTML WYSIWYG Editor. Using <strong>sets</strong> you can configure and customise the editor for every user group."
diff --git a/build/media_source/system/js/fields/joomla-field-subform.w-c.es6.js b/build/media_source/system/js/fields/joomla-field-subform.w-c.es6.js
@@ -279,47 +279,61 @@ class JoomlaFieldSubform extends HTMLElement {
       const nameNew = name.replace(`[${group}][`, `[${groupnew}][`); // New name
       let idNew = id.replace(group, groupnew).replace(/\W/g, '_'); // Count new id
       let countMulti = 0; // count for multiple radio/checkboxes
-      let forOldAttr = id; // Fix "for" in the labels
+      const forOldAttr = $el.id; // Fix "for" in the labels
 
       if ($el.type === 'checkbox' && name.match(/\[\]$/)) { // <input type="checkbox" name="name[]"> fix
-        // Recount id
         countMulti = ids[id] ? ids[id].length : 0;
-        if (!countMulti) {
-          // Set the id for fieldset and group label
-          const fieldset = $el.closest('fieldset.checkboxes');
 
-          const elLbl = row.querySelector(`label[for="${id}"]`);
+        // Set the id for fieldset and group label
+        if (!countMulti) {
+          // Look for <fieldset class="checkboxes"></fieldset> or <fieldset><div class="checkboxes"></div></fieldset>
+          let fieldset = $el.closest('.checkboxes');
+          // eslint-disable-next-line no-nested-ternary
+          fieldset = fieldset.nodeName === 'FIELDSET' ? fieldset : (fieldset.parentElement.nodeName === 'FIELDSET' ? fieldset.parentElement : false);
 
           if (fieldset) {
-            fieldset.setAttribute('id', idNew);
-          }
+            const oldSetId = fieldset.id;
+            fieldset.id = idNew;
+
+            const groupLbl = row.querySelector(`label[for="${oldSetId}"]`);
 
-          if (elLbl) {
-            elLbl.setAttribute('for', idNew);
-            elLbl.setAttribute('id', `${idNew}-lbl`);
+            if (groupLbl) {
+              groupLbl.setAttribute('for', idNew);
+
+              if (groupLbl.id) {
+                groupLbl.setAttribute('id', `${idNew}-lbl`);
+              }
+            }
           }
         }
-        forOldAttr += countMulti;
+
         idNew += countMulti;
       } else if ($el.type === 'radio') { // <input type="radio"> fix
-        // Recount id
         countMulti = ids[id] ? ids[id].length : 0;
-        if (!countMulti) {
-          // Set the id for fieldset and group label
-          const fieldset = $el.closest('fieldset.radio');
 
-          const elLbl = row.querySelector(`label[for="${id}"]`);
+        // Set the id for fieldset and group label
+        if (!countMulti) {
+          // Look for <fieldset class="radio"></fieldset> or <fieldset><div class="radio"></div></fieldset>
+          let fieldset = $el.closest('.radio');
+          // eslint-disable-next-line no-nested-ternary
+          fieldset = fieldset.nodeName === 'FIELDSET' ? fieldset : (fieldset.parentElement.nodeName === 'FIELDSET' ? fieldset.parentElement : false);
 
           if (fieldset) {
-            fieldset.setAttribute('id', idNew);
-          }
+            const oldSetId = fieldset.id;
+            fieldset.id = idNew;
+
+            const groupLbl = row.querySelector(`label[for="${oldSetId}"]`);
+
+            if (groupLbl) {
+              groupLbl.setAttribute('for', idNew);
 
-          if (elLbl) {
-            elLbl.setAttribute('for', idNew);
-            elLbl.setAttribute('id', `${idNew}-lbl`);
+              if (groupLbl.id) {
+                groupLbl.setAttribute('id', `${idNew}-lbl`);
+              }
+            }
           }
         }
-        forOldAttr += countMulti;
+
         idNew += countMulti;
       }
 
@@ -344,7 +358,10 @@ class JoomlaFieldSubform extends HTMLElement {
       const lbl = row.querySelector(`label[for="${forOldAttr}"]`);
       if (lbl) {
         lbl.setAttribute('for', idNew);
-        lbl.setAttribute('id', `${idNew}-lbl`);
+
+        if (lbl.id) {
+          lbl.setAttribute('id', `${idNew}-lbl`);
+        }
       }
     });
   }

diff --git a/installation/language/af-ZA/langmetadata.xml b/installation/language/af-ZA/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Afrikaans (Suid-Afrika)</name>
-	<version>5.1.1</version>
+	<version>5.1.2</version>
 	<creationDate>2024-05</creationDate>
 	<author>Afrikaans Translation Team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

diff --git a/installation/language/ar-AA/langmetadata.xml b/installation/language/ar-AA/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Arabic (اللغة العربية)</name>
-	<version>5.1.1</version>
+	<version>5.1.2</version>
 	<creationDate>2024-05</creationDate>
 	<author>Dr. Ashraf Damra</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

diff --git a/installation/language/be-BY/langmetadata.xml b/installation/language/be-BY/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Belarusian (Belarus)</name>
-	<version>5.1.1</version>
+	<version>5.1.2</version>
 	<creationDate>2024-05</creationDate>
 	<author>Joomla Belarus Community</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

diff --git a/installation/language/bg-BG/langmetadata.xml b/installation/language/bg-BG/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Bulgarian (bg-BG)</name>
-	<version>5.1.1</version>
+	<version>5.1.2</version>
 	<creationDate>2024-05</creationDate>
 	<author>Joomla! Bulgaria</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

diff --git a/installation/language/ca-ES/langmetadata.xml b/installation/language/ca-ES/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Catalan (ca-ES)</name>
-	<version>5.1.1</version>
+	<version>5.1.2</version>
 	<creationDate>2024-05</creationDate>
 	<author>Catalan [ca-ES] Translation Team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

diff --git a/installation/language/cs-CZ/joomla.ini b/installation/language/cs-CZ/joomla.ini
@@ -81,11 +81,13 @@ INSTL_DATABASE_NAME_LABEL="Název databáze"
 INSTL_DATABASE_NAME_MSG_MYSQL="Název databáze je neplatný, nesmí obsahovat následující znaky: \ / ."
 INSTL_DATABASE_NAME_MSG_POSTGRES="Název databáze je neplatný. Musí začínat písmenem, po kterém následují alfanumerické znaky."
 INSTL_DATABASE_NO_SCHEMA="Pro tento typ databáze neexistuje žádné schéma databáze."
+INSTL_DATABASE_PASSWORD_DESC="Zadejte heslo k databázi, které jste vytvořili, nebo heslo poskytnuté hostitelem."
 INSTL_DATABASE_PREFIX_DESC="Zadejte prefix tabulky nebo použijte náhodně vygenerovaný prefix tabulky."
 INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Pokud používáte existující databázi s tabulkami se stejnou předponou, Joomla tyto existující tabulky přejmenuje přidáním předpony \"bak_\"."
 INSTL_DATABASE_PREFIX_MSG="Předpona tabulky musí začínat písmenem, volitelně následují alfanumerické znaky a podtržítko"
 INSTL_DATABASE_RESPONSE_ERROR="Instalační proces selhal."
 INSTL_DATABASE_TYPE_DESC="Vyberte typ databáze."
+INSTL_DATABASE_USER_DESC="Zadejte uživatelské jméno databáze, které jste vytvořili, nebo uživatelské jméno poskytnuté vaším hostitelem."
 INSTL_DATABASE_VALIDATION_ERROR="Zkontrolujte přihlašovací údaje k databázi, typ databáze, název databáze nebo název hostitele. Pokud máte nainstalován MySQL 8, přečtěte si prosím dokumentaci <a href=\"https://docs.joomla.org/Joomla_and_MySQL_8#Workaround_to_get_Joomla_working_with_MySQL_8\" target=\"_blank\" rel=\"noopener noreferrer\">Workaround to get Joomla working with MySQL 8</a> pro více informací."
 
 INSTL_CONNECT_DB="Nastavení databázového připojení"

diff --git a/installation/language/cs-CZ/langmetadata.xml b/installation/language/cs-CZ/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Czech (Čeština)</name>
-	<version>5.1.1</version>
+	<version>5.1.2</version>
 	<creationDate>2024-05</creationDate>
 	<author>Czech Translation Team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

diff --git a/installation/language/cy-GB/langmetadata.xml b/installation/language/cy-GB/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Welsh (United Kingdom)</name>
-	<version>5.1.1</version>
+	<version>5.1.2</version>
 	<creationDate>2024-05</creationDate>
 	<author>Joomla! Project - Welsh Translation Team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

diff --git a/installation/language/da-DK/langmetadata.xml b/installation/language/da-DK/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Danish (Danmark)</name>
-	<version>5.1.1</version>
+	<version>5.1.2</version>
 	<creationDate>2024-05</creationDate>
 	<author>Danish Translation Team (Transl.: Ronny Buelund)</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

diff --git a/installation/language/de-AT/langmetadata.xml b/installation/language/de-AT/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>German (Austria)</name>
-	<version>5.1.0</version>
-	<creationDate>2024-04</creationDate>
+	<version>5.1.1</version>
+	<creationDate>2024-05</creationDate>
 	<author>J!German</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

diff --git a/installation/language/de-CH/langmetadata.xml b/installation/language/de-CH/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>German (Switzerland)</name>
-	<version>5.1.0</version>
-	<creationDate>2024-04</creationDate>
+	<version>5.1.1</version>
+	<creationDate>2024-05</creationDate>
 	<author>J!German</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

diff --git a/installation/language/de-DE/langmetadata.xml b/installation/language/de-DE/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>German (Germany)</name>
-	<version>5.1.0</version>
-	<creationDate>2024-04</creationDate>
+	<version>5.1.1</version>
+	<creationDate>2024-05</creationDate>
 	<author>J!German</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

diff --git a/installation/language/de-LI/langmetadata.xml b/installation/language/de-LI/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>German (Liechtenstein)</name>
-	<version>5.1.0</version>
-	<creationDate>2024-04</creationDate>
+	<version>5.1.1</version>
+	<creationDate>2024-05</creationDate>
 	<author>J!German</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

diff --git a/installation/language/de-LU/langmetadata.xml b/installation/language/de-LU/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>German (Luxembourg)</name>
-	<version>5.1.0</version>
-	<creationDate>2024-04</creationDate>
+	<version>5.1.1</version>
+	<creationDate>2024-05</creationDate>
 	<author>J!German</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

diff --git a/installation/language/el-GR/langmetadata.xml b/installation/language/el-GR/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Greek (el-GR)</name>
-	<version>5.1.1</version>
+	<version>5.1.2</version>
 	<creationDate>2024-05</creationDate>
 	<author>Ομάδα Μετάφρασης: joomla. gr</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

diff --git a/installation/language/en-AU/langmetadata.xml b/installation/language/en-AU/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>English (Australia)</name>
-	<version>5.1.1</version>
+	<version>5.1.2</version>
 	<creationDate>2024-05</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

diff --git a/installation/language/en-CA/langmetadata.xml b/installation/language/en-CA/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>English (Canada)</name>
-	<version>5.1.1</version>
+	<version>5.1.2</version>
 	<creationDate>2024-05</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

diff --git a/installation/language/en-NZ/langmetadata.xml b/installation/language/en-NZ/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>English (New Zealand)</name>
-	<version>5.1.1</version>
+	<version>5.1.2</version>
 	<creationDate>2024-05</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

diff --git a/installation/language/en-US/langmetadata.xml b/installation/language/en-US/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>English (United States)</name>
-	<version>5.1.1</version>
+	<version>5.1.2</version>
 	<creationDate>2024-05</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

diff --git a/installation/language/es-ES/langmetadata.xml b/installation/language/es-ES/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Spanish (es-ES)</name>
-	<version>5.1.1</version>
+	<version>5.1.2</version>
 	<creationDate>2024-05</creationDate>
 	<author>Spanish [es-ES] Translation Team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

diff --git a/installation/language/et-EE/langmetadata.xml b/installation/language/et-EE/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Estonian</name>
-	<version>5.1.1</version>
+	<version>5.1.2</version>
 	<creationDate>2024-05</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

diff --git a/installation/language/eu-ES/langmetadata.xml b/installation/language/eu-ES/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Basque</name>
-	<version>5.1.1</version>
+	<version>5.1.2</version>
 	<creationDate>2024-05</creationDate>
 	<author>Joomla! Basque Translation Team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

diff --git a/installation/language/fa-AF/langmetadata.xml b/installation/language/fa-AF/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>فارسی (دری)</name>
-	<version>5.1.1</version>
+	<version>5.1.2</version>
 	<creationDate>2024-05</creationDate>
 	<author>JoomlaPersian Translation Team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>