From ed9e9e1b17f34a79c13428dc788278dcfd770c31 Mon Sep 17 00:00:00 2001
From: Benjamin Trenkle <benjamin.trenkle@wicked-software.de>
Date: Thu, 4 Jul 2024 18:42:51 +0200
Subject: [PATCH 01/32] Joomla! 4.4.6 Release Candidate 1

---
 administrator/language/en-GB/install.xml       | 2 +-
 administrator/language/en-GB/langmetadata.xml  | 2 +-
 administrator/manifests/files/joomla.xml       | 4 ++--
 administrator/manifests/packages/pkg_en-GB.xml | 2 +-
 api/language/en-GB/install.xml                 | 2 +-
 api/language/en-GB/langmetadata.xml            | 2 +-
 installation/language/en-GB/langmetadata.xml   | 2 +-
 language/en-GB/install.xml                     | 2 +-
 language/en-GB/langmetadata.xml                | 2 +-
 libraries/src/Version.php                      | 8 ++++----
 10 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml
index dd1543e075915..6189242ecc04b 100644
--- a/administrator/language/en-GB/install.xml
+++ b/administrator/language/en-GB/install.xml
@@ -3,7 +3,7 @@
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
 	<version>4.4.6</version>
-	<creationDate>2024-05</creationDate>
+	<creationDate>2024-07</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/language/en-GB/langmetadata.xml b/administrator/language/en-GB/langmetadata.xml
index 7ef4a9c58cdd0..f5709bcc0fbbc 100644
--- a/administrator/language/en-GB/langmetadata.xml
+++ b/administrator/language/en-GB/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="administrator">
 	<name>English (en-GB)</name>
 	<version>4.4.6</version>
-	<creationDate>2024-05</creationDate>
+	<creationDate>2024-07</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml
index 58f4a04950fc3..cf5211c31efec 100644
--- a/administrator/manifests/files/joomla.xml
+++ b/administrator/manifests/files/joomla.xml
@@ -6,8 +6,8 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<copyright>(C) 2019 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>4.4.6-dev</version>
-	<creationDate>2024-05</creationDate>
+	<version>4.4.6-rc1</version>
+	<creationDate>2024-07</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 
 	<scriptfile>administrator/components/com_admin/script.php</scriptfile>
diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml
index 2ffd5eb68868a..35274e3bd127d 100644
--- a/administrator/manifests/packages/pkg_en-GB.xml
+++ b/administrator/manifests/packages/pkg_en-GB.xml
@@ -3,7 +3,7 @@
 	<name>English (en-GB) Language Pack</name>
 	<packagename>en-GB</packagename>
 	<version>4.4.6.1</version>
-	<creationDate>2024-05</creationDate>
+	<creationDate>2024-07</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/api/language/en-GB/install.xml b/api/language/en-GB/install.xml
index d1e09d59766ee..d3fb2d29c8053 100644
--- a/api/language/en-GB/install.xml
+++ b/api/language/en-GB/install.xml
@@ -3,7 +3,7 @@
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
 	<version>4.4.6</version>
-	<creationDate>2024-05</creationDate>
+	<creationDate>2024-07</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/api/language/en-GB/langmetadata.xml b/api/language/en-GB/langmetadata.xml
index 7d5540fa96aa0..cd200124b38f5 100644
--- a/api/language/en-GB/langmetadata.xml
+++ b/api/language/en-GB/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="api">
 	<name>English (en-GB)</name>
 	<version>4.4.6</version>
-	<creationDate>2024-05</creationDate>
+	<creationDate>2024-07</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/installation/language/en-GB/langmetadata.xml b/installation/language/en-GB/langmetadata.xml
index 3f26aa1cddfc2..daf99be4bc626 100644
--- a/installation/language/en-GB/langmetadata.xml
+++ b/installation/language/en-GB/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="installation">
 	<name>English (United Kingdom)</name>
 	<version>4.4.6</version>
-	<creationDate>2024-05</creationDate>
+	<creationDate>2024-07</creationDate>
 	<author>Joomla! Project</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/language/en-GB/install.xml b/language/en-GB/install.xml
index 86ad046a7c12e..265f20d3ba98b 100644
--- a/language/en-GB/install.xml
+++ b/language/en-GB/install.xml
@@ -3,7 +3,7 @@
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
 	<version>4.4.6</version>
-	<creationDate>2024-05</creationDate>
+	<creationDate>2024-07</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/language/en-GB/langmetadata.xml b/language/en-GB/langmetadata.xml
index 4bbbeb1801468..c0381b7c51615 100644
--- a/language/en-GB/langmetadata.xml
+++ b/language/en-GB/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="site">
 	<name>English (en-GB)</name>
 	<version>4.4.6</version>
-	<creationDate>2024-05</creationDate>
+	<creationDate>2024-07</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/libraries/src/Version.php b/libraries/src/Version.php
index 2f67331fbb893..7d74e34a04a66 100644
--- a/libraries/src/Version.php
+++ b/libraries/src/Version.php
@@ -66,7 +66,7 @@ final class Version
      * @var    string
      * @since  3.8.0
      */
-    public const EXTRA_VERSION = 'dev';
+    public const EXTRA_VERSION = 'rc1';
 
     /**
      * Development status.
@@ -74,7 +74,7 @@ final class Version
      * @var    string
      * @since  3.5
      */
-    public const DEV_STATUS = 'Development';
+    public const DEV_STATUS = 'Release Candidate';
 
     /**
      * Code name.
@@ -90,7 +90,7 @@ final class Version
      * @var    string
      * @since  3.5
      */
-    public const RELDATE = '28-May-2024';
+    public const RELDATE = '4-July-2024';
 
     /**
      * Release time.
@@ -98,7 +98,7 @@ final class Version
      * @var    string
      * @since  3.5
      */
-    public const RELTIME = '16:01';
+    public const RELTIME = '18:00';
 
     /**
      * Release timezone.

From 0434d7bd925429b49ab82561d59aaaf56faa553c Mon Sep 17 00:00:00 2001
From: Benjamin Trenkle <benjamin.trenkle@wicked-software.de>
Date: Thu, 4 Jul 2024 18:46:48 +0200
Subject: [PATCH 02/32] Revert to dev

---
 administrator/manifests/files/joomla.xml | 2 +-
 libraries/src/Version.php                | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml
index cf5211c31efec..b00c3299a15f8 100644
--- a/administrator/manifests/files/joomla.xml
+++ b/administrator/manifests/files/joomla.xml
@@ -6,7 +6,7 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<copyright>(C) 2019 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>4.4.6-rc1</version>
+	<version>4.4.6-rc2-dev</version>
 	<creationDate>2024-07</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 
diff --git a/libraries/src/Version.php b/libraries/src/Version.php
index 7d74e34a04a66..5d06cafb518e3 100644
--- a/libraries/src/Version.php
+++ b/libraries/src/Version.php
@@ -66,7 +66,7 @@ final class Version
      * @var    string
      * @since  3.8.0
      */
-    public const EXTRA_VERSION = 'rc1';
+    public const EXTRA_VERSION = 'rc2-dev';
 
     /**
      * Development status.
@@ -74,7 +74,7 @@ final class Version
      * @var    string
      * @since  3.5
      */
-    public const DEV_STATUS = 'Release Candidate';
+    public const DEV_STATUS = 'Development';
 
     /**
      * Code name.
@@ -98,7 +98,7 @@ final class Version
      * @var    string
      * @since  3.5
      */
-    public const RELTIME = '18:00';
+    public const RELTIME = '18:01';
 
     /**
      * Release timezone.

From e1c51ee2fde47075aebd39fe0fd4dc71fd26c6b2 Mon Sep 17 00:00:00 2001
From: Martin Kopp <kopp05@infotech.ch>
Date: Mon, 8 Jul 2024 16:02:11 +0200
Subject: [PATCH 03/32] Prepare Joomla! 4.4.6 581

---
 libraries/src/Form/Field/AccessiblemediaField.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libraries/src/Form/Field/AccessiblemediaField.php b/libraries/src/Form/Field/AccessiblemediaField.php
index 2ab1b18d489a4..033f77b445d12 100644
--- a/libraries/src/Form/Field/AccessiblemediaField.php
+++ b/libraries/src/Form/Field/AccessiblemediaField.php
@@ -195,6 +195,9 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
 			preview="$this->preview"
 			preview_width="$this->previewWidth"
 			preview_height="$this->previewHeight"
+			schemes="http,https,ftp,ftps,data,file"
+			validate="url"
+			relative="true"
 		/>
 
 		<field

From 3d9e88dc8e27483c9783d033a4de7f24688ab3a6 Mon Sep 17 00:00:00 2001
From: Martin Kopp <kopp05@infotech.ch>
Date: Mon, 8 Jul 2024 16:02:13 +0200
Subject: [PATCH 04/32] Prepare Joomla! 4.4.6 585

---
 .../system/js/fields/joomla-field-fancy-select.w-c.es6.js     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/media_source/system/js/fields/joomla-field-fancy-select.w-c.es6.js b/build/media_source/system/js/fields/joomla-field-fancy-select.w-c.es6.js
index 1618bd00af6d6..b8b4f08fef222 100644
--- a/build/media_source/system/js/fields/joomla-field-fancy-select.w-c.es6.js
+++ b/build/media_source/system/js/fields/joomla-field-fancy-select.w-c.es6.js
@@ -239,8 +239,8 @@ window.customElements.define('joomla-field-fancy-select', class extends HTMLElem
 
         // Create and add new
         this.choicesInstance.setChoices([{
-          value: this.newItemPrefix + event.target.value,
-          label: event.target.value,
+          value: new DOMParser().parseFromString(this.newItemPrefix + event.target.value, 'text/html').body.textContent,
+          label: new DOMParser().parseFromString(event.target.value, 'text/html').body.textContent,
           selected: true,
           customProperties: {
             value: event.target.value, // Store real value, just in case

From e1eac609c57ceb84a5d9b8cde241a987ef76468f Mon Sep 17 00:00:00 2001
From: Martin Kopp <kopp05@infotech.ch>
Date: Mon, 8 Jul 2024 16:02:15 +0200
Subject: [PATCH 05/32] Prepare Joomla! 4.4.6 589

---
 libraries/src/HTML/Helpers/StringHelper.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libraries/src/HTML/Helpers/StringHelper.php b/libraries/src/HTML/Helpers/StringHelper.php
index 1c05e89d9912e..113a7e55c6656 100644
--- a/libraries/src/HTML/Helpers/StringHelper.php
+++ b/libraries/src/HTML/Helpers/StringHelper.php
@@ -47,14 +47,16 @@ public static function truncate($text, $length = 0, $noSplit = true, $allowHtml
 
         // Check if HTML tags are allowed.
         if (!$allowHtml) {
+            // Decode entities
+            $text = html_entity_decode($text, ENT_QUOTES, 'UTF-8');
+
             // Deal with spacing issues in the input.
             $text = str_replace('>', '> ', $text);
             $text = str_replace(['&nbsp;', '&#160;'], ' ', $text);
             $text = FrameworkStringHelper::trim(preg_replace('#\s+#mui', ' ', $text));
 
-            // Strip the tags from the input and decode entities.
+            // Strip tags from the input.
             $text = strip_tags($text);
-            $text = html_entity_decode($text, ENT_QUOTES, 'UTF-8');
 
             // Remove remaining extra spaces.
             $text = str_replace('&nbsp;', ' ', $text);

From ce38a5947661964a1e3f0d23ae889ef558f8f9d6 Mon Sep 17 00:00:00 2001
From: Martin Kopp <kopp05@infotech.ch>
Date: Mon, 8 Jul 2024 16:02:17 +0200
Subject: [PATCH 06/32] Prepare Joomla! 4.4.6 592

---
 components/com_wrapper/tmpl/wrapper/default.xml | 2 ++
 modules/mod_wrapper/mod_wrapper.xml             | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/components/com_wrapper/tmpl/wrapper/default.xml b/components/com_wrapper/tmpl/wrapper/default.xml
index 7c04e6653ac44..7f8f5a304bcfa 100644
--- a/components/com_wrapper/tmpl/wrapper/default.xml
+++ b/components/com_wrapper/tmpl/wrapper/default.xml
@@ -16,6 +16,8 @@
 			<field
 				name="url"
 				type="url"
+				validate="url"
+				filter="url"
 				label="COM_WRAPPER_FIELD_URL_LABEL"
 				required="true"
 			/>
diff --git a/modules/mod_wrapper/mod_wrapper.xml b/modules/mod_wrapper/mod_wrapper.xml
index f998114851b4a..d7db7e4a81514 100644
--- a/modules/mod_wrapper/mod_wrapper.xml
+++ b/modules/mod_wrapper/mod_wrapper.xml
@@ -25,7 +25,9 @@
 			<fieldset name="basic">
 				<field
 					name="url"
-					type="text"
+					type="url"
+					validate="url"
+					filter="url"
 					label="MOD_WRAPPER_FIELD_URL_LABEL"
 					required="true"
 				/>

From 93db0360c36440679fbb8ea6a9a83266e121a84d Mon Sep 17 00:00:00 2001
From: Martin Kopp <kopp05@infotech.ch>
Date: Mon, 8 Jul 2024 16:02:19 +0200
Subject: [PATCH 07/32] Prepare Joomla! 4.4.6 594

---
 administrator/components/com_fields/forms/field.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_fields/forms/field.xml b/administrator/components/com_fields/forms/field.xml
index a25de44730f62..5d949e6a43413 100644
--- a/administrator/components/com_fields/forms/field.xml
+++ b/administrator/components/com_fields/forms/field.xml
@@ -90,7 +90,7 @@
 			name="default_value"
 			type="textarea"
 			label="COM_FIELDS_FIELD_DEFAULT_VALUE_LABEL"
-			filter="raw"
+			filter="safehtml"
 		/>
 
 		<field

From ae87846c82b0e4a9274598fa8d788b3b39a2f5aa Mon Sep 17 00:00:00 2001
From: Martin Kopp <kopp05@infotech.ch>
Date: Mon, 8 Jul 2024 16:03:30 +0200
Subject: [PATCH 08/32] Joomla! 4.4.6 Stable

---
 administrator/manifests/files/joomla.xml | 2 +-
 libraries/src/Version.php                | 8 ++++----
 package.json                             | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml
index b00c3299a15f8..8cfb0b9c4105b 100644
--- a/administrator/manifests/files/joomla.xml
+++ b/administrator/manifests/files/joomla.xml
@@ -6,7 +6,7 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<copyright>(C) 2019 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>4.4.6-rc2-dev</version>
+	<version>4.4.6</version>
 	<creationDate>2024-07</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 
diff --git a/libraries/src/Version.php b/libraries/src/Version.php
index 5d06cafb518e3..4da0a47da55d2 100644
--- a/libraries/src/Version.php
+++ b/libraries/src/Version.php
@@ -66,7 +66,7 @@ final class Version
      * @var    string
      * @since  3.8.0
      */
-    public const EXTRA_VERSION = 'rc2-dev';
+    public const EXTRA_VERSION = '';
 
     /**
      * Development status.
@@ -74,7 +74,7 @@ final class Version
      * @var    string
      * @since  3.5
      */
-    public const DEV_STATUS = 'Development';
+    public const DEV_STATUS = 'Stable';
 
     /**
      * Code name.
@@ -90,7 +90,7 @@ final class Version
      * @var    string
      * @since  3.5
      */
-    public const RELDATE = '4-July-2024';
+    public const RELDATE = '9-July-2024';
 
     /**
      * Release time.
@@ -98,7 +98,7 @@ final class Version
      * @var    string
      * @since  3.5
      */
-    public const RELTIME = '18:01';
+    public const RELTIME = '16:00';
 
     /**
      * Release timezone.
diff --git a/package.json b/package.json
index 5f49e3baf389f..fd453f974b21b 100644
--- a/package.json
+++ b/package.json
@@ -111,4 +111,4 @@
     "stylelint-order": "^5.0.0",
     "stylelint-scss": "^4.7.0"
   }
-}
+}
\ No newline at end of file

From 4fca71bcf083f0e110e0ab9bc6809f097b40fc35 Mon Sep 17 00:00:00 2001
From: Martin Kopp <kopp05@infotech.ch>
Date: Tue, 9 Jul 2024 18:25:32 +0200
Subject: [PATCH 09/32] Revert to dev

Signed-off-by: Martin Kopp <kopp05@infotech.ch>
---
 administrator/language/en-GB/install.xml       | 2 +-
 administrator/language/en-GB/langmetadata.xml  | 2 +-
 administrator/manifests/files/joomla.xml       | 2 +-
 administrator/manifests/packages/pkg_en-GB.xml | 2 +-
 api/language/en-GB/install.xml                 | 2 +-
 api/language/en-GB/langmetadata.xml            | 2 +-
 installation/language/en-GB/langmetadata.xml   | 2 +-
 language/en-GB/install.xml                     | 2 +-
 language/en-GB/langmetadata.xml                | 2 +-
 libraries/src/Version.php                      | 8 ++++----
 package.json                                   | 2 +-
 11 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml
index 6189242ecc04b..4bcba1e808c7c 100644
--- a/administrator/language/en-GB/install.xml
+++ b/administrator/language/en-GB/install.xml
@@ -2,7 +2,7 @@
 <extension client="administrator" type="language" method="upgrade">
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
-	<version>4.4.6</version>
+	<version>4.4.7</version>
 	<creationDate>2024-07</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
diff --git a/administrator/language/en-GB/langmetadata.xml b/administrator/language/en-GB/langmetadata.xml
index f5709bcc0fbbc..ac08de35905ee 100644
--- a/administrator/language/en-GB/langmetadata.xml
+++ b/administrator/language/en-GB/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="administrator">
 	<name>English (en-GB)</name>
-	<version>4.4.6</version>
+	<version>4.4.7</version>
 	<creationDate>2024-07</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml
index 8cfb0b9c4105b..fd3629a487f6f 100644
--- a/administrator/manifests/files/joomla.xml
+++ b/administrator/manifests/files/joomla.xml
@@ -6,7 +6,7 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<copyright>(C) 2019 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>4.4.6</version>
+	<version>4.4.7-dev</version>
 	<creationDate>2024-07</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 
diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml
index 35274e3bd127d..765295bb1b86e 100644
--- a/administrator/manifests/packages/pkg_en-GB.xml
+++ b/administrator/manifests/packages/pkg_en-GB.xml
@@ -2,7 +2,7 @@
 <extension type="package" method="upgrade">
 	<name>English (en-GB) Language Pack</name>
 	<packagename>en-GB</packagename>
-	<version>4.4.6.1</version>
+	<version>4.4.7.1</version>
 	<creationDate>2024-07</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
diff --git a/api/language/en-GB/install.xml b/api/language/en-GB/install.xml
index d3fb2d29c8053..11bfab02da3d7 100644
--- a/api/language/en-GB/install.xml
+++ b/api/language/en-GB/install.xml
@@ -2,7 +2,7 @@
 <extension client="api" type="language" method="upgrade">
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
-	<version>4.4.6</version>
+	<version>4.4.7</version>
 	<creationDate>2024-07</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
diff --git a/api/language/en-GB/langmetadata.xml b/api/language/en-GB/langmetadata.xml
index cd200124b38f5..84978b6b1d3ee 100644
--- a/api/language/en-GB/langmetadata.xml
+++ b/api/language/en-GB/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="api">
 	<name>English (en-GB)</name>
-	<version>4.4.6</version>
+	<version>4.4.7</version>
 	<creationDate>2024-07</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
diff --git a/installation/language/en-GB/langmetadata.xml b/installation/language/en-GB/langmetadata.xml
index daf99be4bc626..4c10f25a08b96 100644
--- a/installation/language/en-GB/langmetadata.xml
+++ b/installation/language/en-GB/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>English (United Kingdom)</name>
-	<version>4.4.6</version>
+	<version>4.4.7</version>
 	<creationDate>2024-07</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml
index 265f20d3ba98b..82887e08e6c02 100644
--- a/language/en-GB/install.xml
+++ b/language/en-GB/install.xml
@@ -2,7 +2,7 @@
 <extension client="site" type="language" method="upgrade">
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
-	<version>4.4.6</version>
+	<version>4.4.7</version>
 	<creationDate>2024-07</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
diff --git a/language/en-GB/langmetadata.xml b/language/en-GB/langmetadata.xml
index c0381b7c51615..e1755842d0f49 100644
--- a/language/en-GB/langmetadata.xml
+++ b/language/en-GB/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="site">
 	<name>English (en-GB)</name>
-	<version>4.4.6</version>
+	<version>4.4.7</version>
 	<creationDate>2024-07</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
diff --git a/libraries/src/Version.php b/libraries/src/Version.php
index 4da0a47da55d2..7cc56a9df0a48 100644
--- a/libraries/src/Version.php
+++ b/libraries/src/Version.php
@@ -55,7 +55,7 @@ final class Version
      * @var    integer
      * @since  3.8.0
      */
-    public const PATCH_VERSION = 6;
+    public const PATCH_VERSION = 7;
 
     /**
      * Extra release version info.
@@ -66,7 +66,7 @@ final class Version
      * @var    string
      * @since  3.8.0
      */
-    public const EXTRA_VERSION = '';
+    public const EXTRA_VERSION = 'dev';
 
     /**
      * Development status.
@@ -74,7 +74,7 @@ final class Version
      * @var    string
      * @since  3.5
      */
-    public const DEV_STATUS = 'Stable';
+    public const DEV_STATUS = 'Development';
 
     /**
      * Code name.
@@ -98,7 +98,7 @@ final class Version
      * @var    string
      * @since  3.5
      */
-    public const RELTIME = '16:00';
+    public const RELTIME = '16:01';
 
     /**
      * Release timezone.
diff --git a/package.json b/package.json
index fd453f974b21b..de22c7687e3e4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "joomla",
-  "version": "4.4.6",
+  "version": "4.4.7",
   "description": "Joomla CMS",
   "license": "GPL-2.0-or-later",
   "repository": {

From 25168d3a9b6c007981a14d7de1382f9c5e3f763e Mon Sep 17 00:00:00 2001
From: Quy <quy@nomonkeybiz.com>
Date: Wed, 10 Jul 2024 12:45:26 -0700
Subject: [PATCH 10/32] [4.4] Fix display of total votes (#43740)

* Fix display of total votes

* phpcs

* cs
---
 plugins/content/vote/tmpl/rating.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/content/vote/tmpl/rating.php b/plugins/content/vote/tmpl/rating.php
index 2c1287628f0d4..e0f2a78b290ca 100644
--- a/plugins/content/vote/tmpl/rating.php
+++ b/plugins/content/vote/tmpl/rating.php
@@ -79,17 +79,17 @@
 ?>
 <div class="content_rating" role="img" aria-label="<?php echo Text::sprintf('PLG_VOTE_STAR_RATING', $rating); ?>">
     <?php if ($rcount) : ?>
-    <div class="visually-hidden" itemscope itemtype="https://schema.org/Product">
-        <span itemprop="name"><?php echo $row->title; ?></span>
-        <p class="visually-hidden" itemprop="aggregateRating" itemscope itemtype="https://schema.org/AggregateRating">
-            <?php echo Text::sprintf('PLG_VOTE_USER_RATING', '<span itemprop="ratingValue">' . $rating . '</span>', '<span itemprop="bestRating">5</span>'); ?>
-            <meta itemprop="ratingCount" content="<?php echo $rcount; ?>">
-            <meta itemprop="worstRating" content="1">
-        </p>
+        <div class="visually-hidden" itemscope itemtype="https://schema.org/Product">
+            <span itemprop="name"><?php echo $row->title; ?></span>
+            <p itemprop="aggregateRating" itemscope itemtype="https://schema.org/AggregateRating">
+                <?php echo Text::sprintf('PLG_VOTE_USER_RATING', '<span itemprop="ratingValue">' . $rating . '</span>', '<span itemprop="bestRating">5</span>'); ?>
+                <meta itemprop="ratingCount" content="<?php echo $rcount; ?>">
+                <meta itemprop="worstRating" content="1">
+            </p>
+        </div>
         <?php if ($this->params->get('show_total_votes', 0)) : ?>
             <?php echo Text::sprintf('PLG_VOTE_TOTAL_VOTES', $rcount); ?>
         <?php endif; ?>
-    </div>
     <?php endif; ?>
     <ul>
         <?php echo $img; ?>

From 713348336f3aa5085022ad3b33c25d43582e1a35 Mon Sep 17 00:00:00 2001
From: Nicola Galgano <optimus4joomla@gmail.com>
Date: Thu, 11 Jul 2024 18:54:24 +0200
Subject: [PATCH 11/32] execute-manual (#43750)

---
 libraries/src/Console/TasksListCommand.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/libraries/src/Console/TasksListCommand.php b/libraries/src/Console/TasksListCommand.php
index 25014165b2780..0f78d3cd2bcbe 100644
--- a/libraries/src/Console/TasksListCommand.php
+++ b/libraries/src/Console/TasksListCommand.php
@@ -72,15 +72,22 @@ protected function doExecute(InputInterface $input, OutputInterface $output): in
         $tasks = array_map(
             function (\stdClass $task): array {
                 $enabled  = $task->state === 1;
-                $nextExec = Factory::getDate($task->next_execution, 'UTC');
-                $due      = $enabled && $task->taskOption && Factory::getDate('now', 'UTC') > $nextExec;
+                $rule     = json_decode($task->execution_rules);
+
+                if ($rule->{'rule-type'} === 'manual') {
+                    $nextRun = 'Manual';
+                } else {
+                    $nextExec = Factory::getDate($task->next_execution, 'UTC');
+                    $due      = $enabled && $task->taskOption && Factory::getDate('now', 'UTC') > $nextExec;
+                    $nextRun  = $due ? 'DUE!' : $nextExec->toRFC822();
+                }
 
                 return [
                     'id'             => $task->id,
                     'title'          => $task->title,
                     'type'           => $task->safeTypeTitle,
                     'state'          => $task->state === 1 ? 'Enabled' : ($task->state === 0 ? 'Disabled' : 'Trashed'),
-                    'next_execution' => $due ? 'DUE!' : $nextExec->toRFC822(),
+                    'next_execution' => $nextRun,
                 ];
             },
             $this->getTasks()
@@ -105,7 +112,7 @@ private function getTasks(): array
 
         return $scheduler->fetchTaskRecords(
             ['state' => '*'],
-            ['ordering' => 'a.title', 'select' => 'a.id, a.title, a.type, a.state, a.next_execution']
+            ['ordering' => 'a.title', 'select' => 'a.id, a.title, a.type, a.state, a.next_execution, a.execution_rules']
         );
     }
 

From cba319dedc2bcac13c6e5808d514f4bfb2a1d6ed Mon Sep 17 00:00:00 2001
From: Christiane Maier-Stadtherr <dev@chmst.de>
Date: Sat, 13 Jul 2024 12:06:00 +0200
Subject: [PATCH 12/32] Fix wrong search for id in fields groups (#43774)

---
 administrator/components/com_fields/src/Model/GroupsModel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_fields/src/Model/GroupsModel.php b/administrator/components/com_fields/src/Model/GroupsModel.php
index 95a7cbb276738..5276c51815d80 100644
--- a/administrator/components/com_fields/src/Model/GroupsModel.php
+++ b/administrator/components/com_fields/src/Model/GroupsModel.php
@@ -189,7 +189,7 @@ protected function getListQuery()
             if (stripos($search, 'id:') === 0) {
                 $search = (int) substr($search, 3);
                 $query->where($db->quoteName('a.id') . ' = :search')
-                    ->bind(':id', $search, ParameterType::INTEGER);
+                    ->bind(':search', $search, ParameterType::INTEGER);
             } else {
                 $search = '%' . str_replace(' ', '%', trim($search)) . '%';
                 $query->where($db->quoteName('a.title') . ' LIKE :search')

From 8bceedb802be4f7d7f0949b4f509af96b4408c0a Mon Sep 17 00:00:00 2001
From: Christiane Maier-Stadtherr <dev@chmst.de>
Date: Fri, 19 Jul 2024 14:10:32 +0200
Subject: [PATCH 13/32] Fix copy/paste (#43782)

---
 .../com_actionlogs/src/Controller/DisplayController.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_actionlogs/src/Controller/DisplayController.php b/administrator/components/com_actionlogs/src/Controller/DisplayController.php
index 7493052e2de1c..999dde7fe4aae 100644
--- a/administrator/components/com_actionlogs/src/Controller/DisplayController.php
+++ b/administrator/components/com_actionlogs/src/Controller/DisplayController.php
@@ -17,7 +17,7 @@
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Plugins display controller.
+ * Actionlogs display controller.
  *
  * @since  4.0.0
  */

From 1221ba205e7160bfdfe31f49270f12406549ee9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Heiko=20L=C3=BCbbe?= <github@heikol.de>
Date: Mon, 22 Jul 2024 15:47:55 +0200
Subject: [PATCH 14/32] 2nd ESM Update tests/System/README.md (#43731)

With the https://github.com/joomla/joomla-cms/pull/43702 ESM documentation update, the small problem has arisen that `npx` uses `cypress.config.js` in error messages, although `cypress.config.mjs` is used. This was 'fixed' in using `npm`.

Unfortunately, it turned out that:
* npx cypress run --spec
is not replaceable by:
* npm run cypress:run --spec
therefore changed back.

A short note has been added to the Troubleshooting section.

It was also discovered that the environment variable in the `sudo` call was set in the wrong order, which has been corrected.

Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
---
 tests/System/README.md | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/tests/System/README.md b/tests/System/README.md
index a0c72946fa8c3..e10172abfe791 100644
--- a/tests/System/README.md
+++ b/tests/System/README.md
@@ -68,13 +68,13 @@ npm run cypress:run
 
 You can execute single test specs, e.g. to run the installation step only.
 ```
-npm run cypress:run --spec tests/System/integration/install/Installation.cy.js
+npx cypress run --spec tests/System/integration/install/Installation.cy.js
 ```
 
-You can run multiple test specs separated by commas and use patterns. For example, to execute all the tests from the
-administrator, site, api and plugins specs without the installation step:
+You can run multiple test specs separated by commas and use patterns.
+For example, to run all tests without the installation step:
 ```
-npm run cypress:run --spec 'tests/System/integration/{administrator,site,api,plugins}/**/*.cy.js'
+npx cypress run --spec 'tests/System/integration/{administrator,site,api,plugins}/**/*.cy.js'
 ```
 
 > [!NOTE]
@@ -293,7 +293,7 @@ sudo npm run cypress:run
 
 If the `root` user does not have a Cypress installation, you can use the Cypress installation cache of the current user:
 ```
-sudo CYPRESS_CACHE_FOLDER=$HOME/.cache/Cypress npm run cypress:run
+CYPRESS_CACHE_FOLDER=$HOME/.cache/Cypress sudo npm run cypress:run
 ```
 
 
@@ -310,6 +310,8 @@ If the used SMTP server port is already in use you will see an error like:
 
 :point_right: Configure a different, unused port in the `cypress.config.mjs` file as `smtp_port`.
 
+:point_right: If you use `npx` instead of `npm`, you may see `Your configFile threw an error from: cypress.config.js`,
+but you still need to configure `cypress.config.mjs` file.
 
 ### Timeout Error on Slow Machines
 

From 1b5560a5c2a1400ed9a3eaa174bf99e05f793eed Mon Sep 17 00:00:00 2001
From: Hannes Papenberg <info@joomlager.de>
Date: Wed, 24 Jul 2024 18:57:53 +0200
Subject: [PATCH 15/32] Backendmenu: Fixing export of additionla features for
 menu items (#43188)

---
 .../com_menus/src/View/Menu/XmlView.php       | 47 +++++++++++++++----
 1 file changed, 38 insertions(+), 9 deletions(-)

diff --git a/administrator/components/com_menus/src/View/Menu/XmlView.php b/administrator/components/com_menus/src/View/Menu/XmlView.php
index a699c40977dee..0e955b3bc4b37 100644
--- a/administrator/components/com_menus/src/View/Menu/XmlView.php
+++ b/administrator/components/com_menus/src/View/Menu/XmlView.php
@@ -13,6 +13,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
+use Joomla\CMS\Menu\AdministratorMenuItem;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\CMS\Router\Route;
 use Joomla\Component\Menus\Administrator\Helper\MenusHelper;
@@ -103,8 +104,8 @@ public function display($tpl = null)
     /**
      * Add a child node to the xml
      *
-     * @param   \SimpleXMLElement  $xml   The current XML node which would become the parent to the new node
-     * @param   \stdClass          $item  The menuitem object to create the child XML node from
+     * @param   \SimpleXMLElement      $xml   The current XML node which would become the parent to the new node
+     * @param   AdministratorMenuItem  $item  The menuitem object to create the child XML node from
      *
      * @return  void
      *
@@ -114,22 +115,22 @@ protected function addXmlChild($xml, $item)
     {
         $node = $xml->addChild('menuitem');
 
-        $node['type'] = $item->type;
-
         if ($item->title) {
             $node['title'] = htmlentities($item->title, ENT_XML1);
         }
 
-        if ($item->link) {
-            $node['link'] = $item->link;
-        }
+        $node['type'] = $item->type;
 
         if ($item->element) {
             $node['element'] = $item->element;
         }
 
-        if (isset($item->class) && $item->class) {
-            $node['class'] = htmlentities($item->class, ENT_XML1);
+        if ($item->link) {
+            $node['link'] = $item->link;
+        }
+
+        if (isset($item->class) && trim($item->class)) {
+            $node['class'] = htmlentities(trim($item->class), ENT_XML1);
         }
 
         if ($item->access) {
@@ -140,6 +141,34 @@ protected function addXmlChild($xml, $item)
             $node['target'] = '_blank';
         }
 
+        if ($item->getParams()->get('ajax-badge')) {
+            $node['ajax-badge'] = $item->getParams()->get('ajax-badge');
+        }
+
+        if ($item->icon) {
+            $node['icon'] = $item->icon;
+        }
+
+        if ($item->getParams()->get('menu-quicktask')) {
+            $node['quicktask']       = $item->getParams()->get('menu-quicktask');
+
+            if ($item->getParams()->get('menu-quicktask-title')) {
+                $node['quicktask-title'] = $item->getParams()->get('menu-quicktask-title');
+            }
+
+            if ($item->getParams()->get('menu-quicktask-icon')) {
+                $node['quicktask-icon'] = $item->getParams()->get('menu-quicktask-icon');
+            }
+
+            if ($item->getParams()->get('menu-quicktask-permission')) {
+                $node['quicktask-permission'] = $item->getParams()->get('menu-quicktask-permission');
+            }
+        }
+
+        if ($item->getParams()->get('dashboard')) {
+            $node['dashboard'] = $item->getParams()->get('dashboard');
+        }
+
         if ($item->getParams() && $hideitems = $item->getParams()->get('hideitems')) {
             $item->getParams()->set('hideitems', $this->getModel('Menu')->getExtensionElementsForMenuItems($hideitems));
 

From 29ee5c2877346a40a42079fb8f5f02d973fa57aa Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Fri, 26 Jul 2024 15:32:37 +0100
Subject: [PATCH 16/32] [4.4] Typo Update showon.es6.js (#43848)

Obvious typo using a number instead of a letter
---
 build/media_source/system/js/showon.es6.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/media_source/system/js/showon.es6.js b/build/media_source/system/js/showon.es6.js
index d675c60e6ac9f..cc35009342269 100644
--- a/build/media_source/system/js/showon.es6.js
+++ b/build/media_source/system/js/showon.es6.js
@@ -146,7 +146,7 @@ class Showon {
             itemval = Array.from(originField.querySelectorAll('option:checked')).map((el) => el.value);
           } else {
             // Select lists, text-area etc. Note that multiple-select list returns
-            // an Array here s0 we can always treat 'itemval' as an array
+            // an Array here so we can always treat 'itemval' as an array
             itemval = document.getElementById(originId).value;
             // A multi-select <select> $field  will return null when no elements are
             // selected so we need to define itemval accordingly

From 4a21f3ee6a8ce3123b56d55ec83d6239530ffd4b Mon Sep 17 00:00:00 2001
From: Allon Moritz <allon.moritz@digital-peak.com>
Date: Mon, 29 Jul 2024 17:48:19 +0200
Subject: [PATCH 17/32] Don't execute max system tests on pr commits (#43846)

* Don't execute max system tests on pr commits

* Signature

* Run php max on postgres
---
 .drone.yml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 41889d3c84726..2f86e38f6f8fe 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -246,6 +246,10 @@ steps:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
       - bash tests/System/drone-system-run.sh "$(pwd)" cpostgres pgsql postgres
+    when:
+      event:
+        exclude:
+          - pull_request
 
   - name: phpmax-system-mysql
     depends_on:
@@ -259,6 +263,10 @@ steps:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
       - bash tests/System/drone-system-run.sh "$(pwd)" cmysqlmax mysqli mysql
+    when:
+      event:
+        exclude:
+          - pull_request
 
   - name: phpmax-system-postgres
     depends_on:
@@ -285,6 +293,10 @@ steps:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
       - bash tests/System/drone-system-run.sh "$(pwd)" cmysql8 mysqli mysql8
+    when:
+      event:
+        exclude:
+          - pull_request
 
   - name: phpmax-system-mysql8
     depends_on:
@@ -298,6 +310,10 @@ steps:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
       - bash tests/System/drone-system-run.sh "$(pwd)" cmysql8max mysqli mysql8
+    when:
+      event:
+        exclude:
+          - pull_request
 
   - name: artifacts-system-tests
     image: joomlaprojects/docker-images:packager
@@ -504,6 +520,6 @@ trigger:
 
 ---
 kind: signature
-hmac: ccc71c7a0c6643aef1000b49a0125d4a9bf2bacedc3875c9106b31449e7f50f8
+hmac: 0f965e69f4773b289498dd7e06d3031f9ad89038606a7ace3632766c47283045
 
 ...

From 09595561325524829801faf394f336aacf6f456c Mon Sep 17 00:00:00 2001
From: Dimitris Grammatikogiannis <dg@dgrammatiko.dev>
Date: Fri, 2 Aug 2024 01:15:17 +0300
Subject: [PATCH 18/32] [4.4][bugfix] Use iife for the scripts core and
 validate (#43755)

* iife

* fixes

* globals

---------
---
 .../javascript/compile-to-es2017.es6.js       |    9 +-
 .../plg_system_jooa11y/js/jooa11y.es6.js      |    1 +
 build/media_source/system/js/core.es6.js      | 1154 ++++++++---------
 .../system/js/fields/validate.es6.js          |    9 +
 package-lock.json                             |    6 +-
 5 files changed, 597 insertions(+), 582 deletions(-)

diff --git a/build/build-modules-js/javascript/compile-to-es2017.es6.js b/build/build-modules-js/javascript/compile-to-es2017.es6.js
index dc90baa5a58bd..70f8dc08d6f2c 100644
--- a/build/build-modules-js/javascript/compile-to-es2017.es6.js
+++ b/build/build-modules-js/javascript/compile-to-es2017.es6.js
@@ -10,6 +10,13 @@ const { renderSync } = require('sass-embedded');
 const { minifyJsCode } = require('./minify.es6.js');
 const { handleESMToLegacy } = require('./compile-to-es5.es6.js');
 
+function esmOrIife(file) {
+  if (file.endsWith('core.es6.js') || file.endsWith('validate.es6.js')) {
+    return 'iife';
+  }
+  return 'es';
+}
+
 const getWcMinifiedCss = async (file) => {
   let scssFileExists = false;
   const scssFile = file.replace(`${sep}js${sep}`, `${sep}scss${sep}`).replace(/\.w-c\.es6\.js$/, '.scss');
@@ -89,7 +96,7 @@ module.exports.handleESMFile = async (file) => {
   });
 
   bundle.write({
-    format: 'es',
+    format: esmOrIife(file),
     sourcemap: false,
     file: resolve(`${newPath}.js`),
   })
diff --git a/build/media_source/plg_system_jooa11y/js/jooa11y.es6.js b/build/media_source/plg_system_jooa11y/js/jooa11y.es6.js
index a244ba011caa1..bfdccb3d1c70f 100644
--- a/build/media_source/plg_system_jooa11y/js/jooa11y.es6.js
+++ b/build/media_source/plg_system_jooa11y/js/jooa11y.es6.js
@@ -1,3 +1,4 @@
+// eslint-disable-next-line import/no-unresolved
 import { Jooa11y, Lang } from '@joomla/joomla-a11y-checker/dist/js/joomla-a11y-checker.esm.js';
 
 if (!Joomla) {
diff --git a/build/media_source/system/js/core.es6.js b/build/media_source/system/js/core.es6.js
index a3216b9353af0..c55187e4dea63 100644
--- a/build/media_source/system/js/core.es6.js
+++ b/build/media_source/system/js/core.es6.js
@@ -3,6 +3,8 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+'use strict';
+
 import { sanitizeHtml } from 'bootstrap/js/src/util/sanitizer.js';
 
 const ARIA_ATTRIBUTE_PATTERN = /^aria-[\w-]*$/i;
@@ -57,10 +59,10 @@ const DefaultAllowlist = {
 window.Joomla = window.Joomla || {};
 
 // Only define editors if not defined
-window.Joomla.editors = window.Joomla.editors || {};
+Joomla.editors = Joomla.editors || {};
 
 // An object to hold each editor instance on page, only define if not defined.
-window.Joomla.editors.instances = window.Joomla.editors.instances || {
+Joomla.editors.instances = Joomla.editors.instances || {
   /**
    * *****************************************************************
    * All Editors MUST register, per instance, the following callbacks:
@@ -101,7 +103,7 @@ window.Joomla.editors.instances = window.Joomla.editors.instances || {
    */
 };
 
-window.Joomla.Modal = window.Joomla.Modal || {
+Joomla.Modal = Joomla.Modal || {
   /**
    * *****************************************************************
    * Modals should implement
@@ -127,670 +129,666 @@ window.Joomla.Modal = window.Joomla.Modal || {
    */
   current: '',
   setCurrent: (element) => {
-    window.Joomla.Modal.current = element;
+    Joomla.Modal.current = element;
   },
-  getCurrent: () => window.Joomla.Modal.current,
+  getCurrent: () => Joomla.Modal.current,
 };
 
-((Joomla) => {
-  'use strict';
-
+/**
+ * Method to Extend Objects
+ *
+ * @param  {Object}  destination
+ * @param  {Object}  source
+ *
+ * @return Object
+ */
+Joomla.extend = (destination, source) => {
+  let newDestination = destination;
   /**
-   * Method to Extend Objects
-   *
-   * @param  {Object}  destination
-   * @param  {Object}  source
-   *
-   * @return Object
+   * Technically null is an object, but trying to treat the destination as one in this
+   * context will error out.
+   * So emulate jQuery.extend(), and treat a destination null as an empty object.
    */
-  Joomla.extend = (destination, source) => {
-    let newDestination = destination;
-    /**
-     * Technically null is an object, but trying to treat the destination as one in this
-     * context will error out.
-     * So emulate jQuery.extend(), and treat a destination null as an empty object.
-     */
-    if (destination === null) {
-      newDestination = {};
-    }
+  if (destination === null) {
+    newDestination = {};
+  }
 
-    [].slice.call(Object.keys(source)).forEach((key) => {
-      newDestination[key] = source[key];
-    });
+  [].slice.call(Object.keys(source)).forEach((key) => {
+    newDestination[key] = source[key];
+  });
 
-    return destination;
-  };
+  return destination;
+};
 
-  /**
-   * Joomla options storage
-   *
-   * @type {{}}
-   *
-   * @since 3.7.0
-   */
-  Joomla.optionsStorage = Joomla.optionsStorage || null;
+/**
+ * Joomla options storage
+ *
+ * @type {{}}
+ *
+ * @since 3.7.0
+ */
+Joomla.optionsStorage = Joomla.optionsStorage || null;
 
-  /**
-   * Get script(s) options
-   *
-   * @param  {String}  key  Name in Storage
-   * @param  {mixed}   def  Default value if nothing found
-   *
-   * @return {mixed}
-   *
-   * @since 3.7.0
-   */
-  Joomla.getOptions = (key, def) => {
-    // Load options if they not exists
-    if (!Joomla.optionsStorage) {
-      Joomla.loadOptions();
-    }
+/**
+ * Get script(s) options
+ *
+ * @param  {String}  key  Name in Storage
+ * @param  {mixed}   def  Default value if nothing found
+ *
+ * @return {mixed}
+ *
+ * @since 3.7.0
+ */
+Joomla.getOptions = (key, def) => {
+  // Load options if they not exists
+  if (!Joomla.optionsStorage) {
+    Joomla.loadOptions();
+  }
 
-    return Joomla.optionsStorage[key] !== undefined ? Joomla.optionsStorage[key] : def;
-  };
+  return Joomla.optionsStorage[key] !== undefined ? Joomla.optionsStorage[key] : def;
+};
 
-  /**
-   * Load new options from given options object or from Element
-   *
-   * @param  {Object|undefined}  options  The options object to load.
-   * Eg {"com_foobar" : {"option1": 1, "option2": 2}}
-   *
-   * @since 3.7.0
-   */
-  Joomla.loadOptions = (options) => {
-    // Load form the script container
-    if (!options) {
-      const elements = [].slice.call(document.querySelectorAll('.joomla-script-options.new'));
-      let counter = 0;
-
-      elements.forEach((element) => {
-        const str = element.text || element.textContent;
-        const option = JSON.parse(str);
-
-        if (option) {
-          Joomla.loadOptions(option);
-          counter += 1;
-        }
+/**
+ * Load new options from given options object or from Element
+ *
+ * @param  {Object|undefined}  options  The options object to load.
+ * Eg {"com_foobar" : {"option1": 1, "option2": 2}}
+ *
+ * @since 3.7.0
+ */
+Joomla.loadOptions = (options) => {
+  // Load form the script container
+  if (!options) {
+    const elements = [].slice.call(document.querySelectorAll('.joomla-script-options.new'));
+    let counter = 0;
 
-        element.className = element.className.replace(' new', ' loaded');
-      });
+    elements.forEach((element) => {
+      const str = element.text || element.textContent;
+      const option = JSON.parse(str);
 
-      if (counter) {
-        return;
+      if (option) {
+        Joomla.loadOptions(option);
+        counter += 1;
       }
-    }
 
-    // Initial loading
-    if (!Joomla.optionsStorage) {
-      Joomla.optionsStorage = options || {};
-    } else if (options) {
-      // Merge with existing
-      [].slice.call(Object.keys(options)).forEach((key) => {
-        /**
-         * If both existing and new options are objects, merge them with Joomla.extend().
-         * But test for new option being null, as null is an object, but we want to allow
-         * clearing of options with ...
-         *
-         * Joomla.loadOptions({'joomla.jtext': null});
-         */
-        if (options[key] !== null && typeof Joomla.optionsStorage[key] === 'object' && typeof options[key] === 'object') {
-          Joomla.optionsStorage[key] = Joomla.extend(Joomla.optionsStorage[key], options[key]);
-        } else {
-          Joomla.optionsStorage[key] = options[key];
-        }
-      });
-    }
-  };
+      element.className = element.className.replace(' new', ' loaded');
+    });
 
-  /**
-   * Custom behavior for JavaScript I18N in Joomla! 1.6
-   *
-   * @type {{}}
-   *
-   * Allows you to call Joomla.Text._() to get a translated JavaScript string
-   * pushed in with Text::script() in Joomla.
-   */
-  Joomla.Text = {
-    strings: {},
-
-    /**
-     * Translates a string into the current language.
-     *
-     * @param {String} key   The string to translate
-     * @param {String} def   Default string
-     *
-     * @returns {String}
-     */
-    _: (key, def) => {
-      let newKey = key;
-      let newDef = def;
-      // Check for new strings in the optionsStorage, and load them
-      const newStrings = Joomla.getOptions('joomla.jtext');
-      if (newStrings) {
-        Joomla.Text.load(newStrings);
-
-        // Clean up the optionsStorage from useless data
-        Joomla.loadOptions({ 'joomla.jtext': null });
+    if (counter) {
+      return;
+    }
+  }
+
+  // Initial loading
+  if (!Joomla.optionsStorage) {
+    Joomla.optionsStorage = options || {};
+  } else if (options) {
+    // Merge with existing
+    [].slice.call(Object.keys(options)).forEach((key) => {
+      /**
+       * If both existing and new options are objects, merge them with Joomla.extend().
+       * But test for new option being null, as null is an object, but we want to allow
+       * clearing of options with ...
+       *
+       * Joomla.loadOptions({'joomla.jtext': null});
+       */
+      if (options[key] !== null && typeof Joomla.optionsStorage[key] === 'object' && typeof options[key] === 'object') {
+        Joomla.optionsStorage[key] = Joomla.extend(Joomla.optionsStorage[key], options[key]);
+      } else {
+        Joomla.optionsStorage[key] = options[key];
       }
+    });
+  }
+};
 
-      newDef = newDef === undefined ? newKey : newDef;
-      newKey = newKey.toUpperCase();
-
-      return Joomla.Text.strings[newKey] !== undefined ? Joomla.Text.strings[newKey] : newDef;
-    },
-
-    /**
-     * Load new strings in to Joomla.Text
-     *
-     * @param {Object} object  Object with new strings
-     * @returns {Joomla.Text}
-     */
-    load: (object) => {
-      [].slice.call(Object.keys(object)).forEach((key) => {
-        Joomla.Text.strings[key.toUpperCase()] = object[key];
-      });
-
-      return Joomla.Text;
-    },
-  };
-
-  /**
-   * For B/C we still support Joomla.JText
-   *
-   * @type {{}}
-   *
-   * @deprecated   4.0 will be removed in 6.0
-   *               Example: Joomla.Text._('...');
-   *                        Joomla.Text.load(...);
-   */
-  Joomla.JText = Joomla.Text;
+/**
+ * Custom behavior for JavaScript I18N in Joomla! 1.6
+ *
+ * @type {{}}
+ *
+ * Allows you to call Joomla.Text._() to get a translated JavaScript string
+ * pushed in with Text::script() in Joomla.
+ */
+Joomla.Text = {
+  strings: {},
 
   /**
-   * Generic submit form
+   * Translates a string into the current language.
    *
-   * @param  {String}  task      The given task
-   * @param  {node}    form      The form element
-   * @param  {bool}    validate  The form element
+   * @param {String} key   The string to translate
+   * @param {String} def   Default string
    *
-   * @returns  {void}
+   * @returns {String}
    */
-  Joomla.submitform = (task, form, validate) => {
-    let newForm = form;
-    const newTask = task;
-
-    if (!newForm) {
-      newForm = document.getElementById('adminForm');
+  _: (key, def) => {
+    let newKey = key;
+    let newDef = def;
+    // Check for new strings in the optionsStorage, and load them
+    const newStrings = Joomla.getOptions('joomla.jtext');
+    if (newStrings) {
+      Joomla.Text.load(newStrings);
+
+      // Clean up the optionsStorage from useless data
+      Joomla.loadOptions({ 'joomla.jtext': null });
     }
 
-    if (newTask) {
-      newForm.task.value = newTask;
-    }
-
-    // Toggle HTML5 validation
-    newForm.noValidate = !validate;
-
-    if (!validate) {
-      newForm.setAttribute('novalidate', '');
-    } else if (newForm.hasAttribute('novalidate')) {
-      newForm.removeAttribute('novalidate');
-    }
+    newDef = newDef === undefined ? newKey : newDef;
+    newKey = newKey.toUpperCase();
 
-    // Submit the form.
-    // Create the input type="submit"
-    const button = document.createElement('input');
-    button.classList.add('hidden');
-    button.type = 'submit';
-
-    // Append it and click it
-    newForm.appendChild(button).click();
-
-    // If "submit" was prevented, make sure we don't get a build up of buttons
-    newForm.removeChild(button);
-  };
+    return Joomla.Text.strings[newKey] !== undefined ? Joomla.Text.strings[newKey] : newDef;
+  },
 
   /**
-   * Default function. Can be overridden by the component to add custom logic
-   *
-   * @param  {String}  task            The given task
-   * @param  {String}  formSelector    The form selector eg '#adminForm'
-   * @param  {bool}    validate        The form element
+   * Load new strings in to Joomla.Text
    *
-   * @returns {void}
+   * @param {Object} object  Object with new strings
+   * @returns {Joomla.Text}
    */
-  Joomla.submitbutton = (task, formSelector, validate) => {
-    let form = document.querySelector(formSelector || 'form.form-validate');
-    let newValidate = validate;
-
-    if (typeof formSelector === 'string' && form === null) {
-      form = document.querySelector(`#${formSelector}`);
-    }
+  load: (object) => {
+    [].slice.call(Object.keys(object)).forEach((key) => {
+      Joomla.Text.strings[key.toUpperCase()] = object[key];
+    });
 
-    if (form) {
-      if (newValidate === undefined || newValidate === null) {
-        const pressbutton = task.split('.');
-        let cancelTask = form.getAttribute('data-cancel-task');
+    return Joomla.Text;
+  },
+};
 
-        if (!cancelTask) {
-          cancelTask = `${pressbutton[0]}.cancel`;
-        }
+/**
+ * For B/C we still support Joomla.JText
+ *
+ * @type {{}}
+ *
+ * @deprecated   4.0 will be removed in 6.0
+ *               Example: Joomla.Text._('...');
+ *                        Joomla.Text.load(...);
+ */
+Joomla.JText = Joomla.Text;
 
-        newValidate = task !== cancelTask;
-      }
+/**
+ * Generic submit form
+ *
+ * @param  {String}  task      The given task
+ * @param  {node}    form      The form element
+ * @param  {bool}    validate  The form element
+ *
+ * @returns  {void}
+ */
+Joomla.submitform = (task, form, validate) => {
+  let newForm = form;
+  const newTask = task;
+
+  if (!newForm) {
+    newForm = document.getElementById('adminForm');
+  }
+
+  if (newTask) {
+    newForm.task.value = newTask;
+  }
+
+  // Toggle HTML5 validation
+  newForm.noValidate = !validate;
+
+  if (!validate) {
+    newForm.setAttribute('novalidate', '');
+  } else if (newForm.hasAttribute('novalidate')) {
+    newForm.removeAttribute('novalidate');
+  }
+
+  // Submit the form.
+  // Create the input type="submit"
+  const button = document.createElement('input');
+  button.classList.add('hidden');
+  button.type = 'submit';
+
+  // Append it and click it
+  newForm.appendChild(button).click();
+
+  // If "submit" was prevented, make sure we don't get a build up of buttons
+  newForm.removeChild(button);
+};
 
-      if (!newValidate || document.formvalidator.isValid(form)) {
-        Joomla.submitform(task, form);
-      }
-    } else {
-      Joomla.submitform(task);
-    }
-  };
+/**
+ * Default function. Can be overridden by the component to add custom logic
+ *
+ * @param  {String}  task            The given task
+ * @param  {String}  formSelector    The form selector eg '#adminForm'
+ * @param  {bool}    validate        The form element
+ *
+ * @returns {void}
+ */
+Joomla.submitbutton = (task, formSelector, validate) => {
+  let form = document.querySelector(formSelector || 'form.form-validate');
+  let newValidate = validate;
 
-  /**
-   * USED IN: all list forms.
-   *
-   * Toggles the check state of a group of boxes
-   *
-   * Checkboxes must have an id attribute in the form cb0, cb1...
-   *
-   * @param {mixed}  checkbox The number of box to 'check', for a checkbox element
-   * @param {string} stub     An alternative field name
-   *
-   * @return {boolean}
-   */
-  Joomla.checkAll = (checkbox, stub) => {
-    if (!checkbox.form) {
-      return false;
-    }
+  if (typeof formSelector === 'string' && form === null) {
+    form = document.querySelector(`#${formSelector}`);
+  }
 
-    const currentStab = stub || 'cb';
-    const elements = [].slice.call(checkbox.form.elements);
-    let state = 0;
+  if (form) {
+    if (newValidate === undefined || newValidate === null) {
+      const pressbutton = task.split('.');
+      let cancelTask = form.getAttribute('data-cancel-task');
 
-    elements.forEach((element) => {
-      if (element.type === checkbox.type && element.id.indexOf(currentStab) === 0) {
-        element.checked = checkbox.checked;
-        state += element.checked ? 1 : 0;
+      if (!cancelTask) {
+        cancelTask = `${pressbutton[0]}.cancel`;
       }
-    });
 
-    if (checkbox.form.boxchecked) {
-      checkbox.form.boxchecked.value = state;
-      checkbox.form.boxchecked.dispatchEvent(new CustomEvent('change', {
-        bubbles: true,
-        cancelable: true,
-      }));
+      newValidate = task !== cancelTask;
     }
 
-    return true;
-  };
-
-  /**
-   * USED IN: administrator/components/com_cache/views/cache/tmpl/default.php
-   * administrator/components/com_installer/views/discover/tmpl/default_item.php
-   * administrator/components/com_installer/views/update/tmpl/default_item.php
-   * administrator/components/com_languages/helpers/html/languages.php
-   * libraries/joomla/html/html/grid.php
-   *
-   * @param  {boolean}  isitchecked  Flag for checked
-   * @param  {node}     form         The form
-   *
-   * @return  {void}
-   */
-  Joomla.isChecked = (isitchecked, form) => {
-    let newForm = form;
-    if (typeof newForm === 'undefined') {
-      newForm = document.getElementById('adminForm');
-    } else if (typeof form === 'string') {
-      newForm = document.getElementById(form);
+    if (!newValidate || document.formvalidator.isValid(form)) {
+      Joomla.submitform(task, form);
     }
+  } else {
+    Joomla.submitform(task);
+  }
+};
 
-    newForm.boxchecked.value = isitchecked
-      ? parseInt(newForm.boxchecked.value, 10) + 1
-      : parseInt(newForm.boxchecked.value, 10) - 1;
+/**
+ * USED IN: all list forms.
+ *
+ * Toggles the check state of a group of boxes
+ *
+ * Checkboxes must have an id attribute in the form cb0, cb1...
+ *
+ * @param {mixed}  checkbox The number of box to 'check', for a checkbox element
+ * @param {string} stub     An alternative field name
+ *
+ * @return {boolean}
+ */
+Joomla.checkAll = (checkbox, stub) => {
+  if (!checkbox.form) {
+    return false;
+  }
 
-    newForm.boxchecked.dispatchEvent(new CustomEvent('change', {
-      bubbles: true,
-      cancelable: true,
-    }));
+  const currentStab = stub || 'cb';
+  const elements = [].slice.call(checkbox.form.elements);
+  let state = 0;
 
-    // If we don't have a checkall-toggle, done.
-    if (!newForm.elements['checkall-toggle']) {
-      return;
+  elements.forEach((element) => {
+    if (element.type === checkbox.type && element.id.indexOf(currentStab) === 0) {
+      element.checked = checkbox.checked;
+      state += element.checked ? 1 : 0;
     }
+  });
 
-    // Toggle main toggle checkbox depending on checkbox selection
-    let c = true;
-    let i;
-    let e;
-    let n;
+  if (checkbox.form.boxchecked) {
+    checkbox.form.boxchecked.value = state;
+    checkbox.form.boxchecked.dispatchEvent(new CustomEvent('change', {
+      bubbles: true,
+      cancelable: true,
+    }));
+  }
 
-    // eslint-disable-next-line no-plusplus
-    for (i = 0, n = newForm.elements.length; i < n; i++) {
-      e = newForm.elements[i];
+  return true;
+};
 
-      if (e.type === 'checkbox' && e.name !== 'checkall-toggle' && !e.checked) {
-        c = false;
-        break;
-      }
+/**
+ * USED IN: administrator/components/com_cache/views/cache/tmpl/default.php
+ * administrator/components/com_installer/views/discover/tmpl/default_item.php
+ * administrator/components/com_installer/views/update/tmpl/default_item.php
+ * administrator/components/com_languages/helpers/html/languages.php
+ * libraries/joomla/html/html/grid.php
+ *
+ * @param  {boolean}  isitchecked  Flag for checked
+ * @param  {node}     form         The form
+ *
+ * @return  {void}
+ */
+Joomla.isChecked = (isitchecked, form) => {
+  let newForm = form;
+  if (typeof newForm === 'undefined') {
+    newForm = document.getElementById('adminForm');
+  } else if (typeof form === 'string') {
+    newForm = document.getElementById(form);
+  }
+
+  newForm.boxchecked.value = isitchecked
+    ? parseInt(newForm.boxchecked.value, 10) + 1
+    : parseInt(newForm.boxchecked.value, 10) - 1;
+
+  newForm.boxchecked.dispatchEvent(new CustomEvent('change', {
+    bubbles: true,
+    cancelable: true,
+  }));
+
+  // If we don't have a checkall-toggle, done.
+  if (!newForm.elements['checkall-toggle']) {
+    return;
+  }
+
+  // Toggle main toggle checkbox depending on checkbox selection
+  let c = true;
+  let i;
+  let e;
+  let n;
+
+  // eslint-disable-next-line no-plusplus
+  for (i = 0, n = newForm.elements.length; i < n; i++) {
+    e = newForm.elements[i];
+
+    if (e.type === 'checkbox' && e.name !== 'checkall-toggle' && !e.checked) {
+      c = false;
+      break;
     }
+  }
 
-    newForm.elements['checkall-toggle'].checked = c;
-  };
-
-  /**
-   * USED IN: libraries/joomla/html/html/grid.php
-   * In other words, on any reorderable table
-   *
-   * @param  {string}  order  The order value
-   * @param  {string}  dir    The direction
-   * @param  {string}  task   The task
-   * @param  {node}    form   The form
-   *
-   * return  {void}
-   */
-  Joomla.tableOrdering = (order, dir, task, form) => {
-    let newForm = form;
-    if (typeof newForm === 'undefined') {
-      newForm = document.getElementById('adminForm');
-    } else if (typeof form === 'string') {
-      newForm = document.getElementById(form);
-    }
+  newForm.elements['checkall-toggle'].checked = c;
+};
 
-    newForm.filter_order.value = order;
-    newForm.filter_order_Dir.value = dir;
-    Joomla.submitform(task, newForm);
-  };
+/**
+ * USED IN: libraries/joomla/html/html/grid.php
+ * In other words, on any reorderable table
+ *
+ * @param  {string}  order  The order value
+ * @param  {string}  dir    The direction
+ * @param  {string}  task   The task
+ * @param  {node}    form   The form
+ *
+ * return  {void}
+ */
+Joomla.tableOrdering = (order, dir, task, form) => {
+  let newForm = form;
+  if (typeof newForm === 'undefined') {
+    newForm = document.getElementById('adminForm');
+  } else if (typeof form === 'string') {
+    newForm = document.getElementById(form);
+  }
+
+  newForm.filter_order.value = order;
+  newForm.filter_order_Dir.value = dir;
+  Joomla.submitform(task, newForm);
+};
 
-  /**
-   * USED IN: all over :)
-   *
-   * @param  {string}  id    The id
-   * @param  {string}  task  The task
-   * @param  {string}  form  The optional form
-   *
-   * @return {boolean}
-   */
-  Joomla.listItemTask = (id, task, form = null) => {
-    let newForm = form;
-    if (form !== null) {
-      newForm = document.getElementById(form);
-    } else {
-      newForm = document.adminForm;
-    }
+/**
+ * USED IN: all over :)
+ *
+ * @param  {string}  id    The id
+ * @param  {string}  task  The task
+ * @param  {string}  form  The optional form
+ *
+ * @return {boolean}
+ */
+Joomla.listItemTask = (id, task, form = null) => {
+  let newForm = form;
+  if (form !== null) {
+    newForm = document.getElementById(form);
+  } else {
+    newForm = document.adminForm;
+  }
+
+  const cb = newForm[id];
+  let i = 0;
+  let cbx;
+
+  if (!cb) {
+    return false;
+  }
 
-    const cb = newForm[id];
-    let i = 0;
-    let cbx;
+  // eslint-disable-next-line no-constant-condition
+  while (true) {
+    cbx = newForm[`cb${i}`];
 
-    if (!cb) {
-      return false;
+    if (!cbx) {
+      break;
     }
 
-    // eslint-disable-next-line no-constant-condition
-    while (true) {
-      cbx = newForm[`cb${i}`];
+    cbx.checked = false;
 
-      if (!cbx) {
-        break;
-      }
+    i += 1;
+  }
 
-      cbx.checked = false;
+  cb.checked = true;
+  newForm.boxchecked.value = 1;
+  Joomla.submitform(task, newForm);
 
-      i += 1;
-    }
+  return false;
+};
 
-    cb.checked = true;
-    newForm.boxchecked.value = 1;
-    Joomla.submitform(task, newForm);
+/**
+ * Method to replace all request tokens on the page with a new one.
+ *
+ * @param {String}  newToken  The token
+ *
+ * Used in Joomla Installation
+ */
+Joomla.replaceTokens = (newToken) => {
+  if (!/^[0-9A-F]{32}$/i.test(newToken)) {
+    return;
+  }
 
-    return false;
-  };
+  const elements = [].slice.call(document.getElementsByTagName('input'));
 
-  /**
-   * Method to replace all request tokens on the page with a new one.
-   *
-   * @param {String}  newToken  The token
-   *
-   * Used in Joomla Installation
-   */
-  Joomla.replaceTokens = (newToken) => {
-    if (!/^[0-9A-F]{32}$/i.test(newToken)) {
-      return;
+  elements.forEach((element) => {
+    if (element.type === 'hidden' && element.value === '1' && element.name.length === 32) {
+      element.name = newToken;
     }
+  });
+};
 
-    const elements = [].slice.call(document.getElementsByTagName('input'));
+/**
+ * Method to perform AJAX request
+ *
+ * @param {Object} options   Request options:
+ * {
+ *    url:     'index.php', Request URL
+ *    method:  'GET',       Request method GET (default), POST
+ *    data:    null,        Data to be sent, see
+ *                https://developer.mozilla.org/docs/Web/API/XMLHttpRequest/send
+ *    perform: true,        Perform the request immediately
+ *              or return XMLHttpRequest instance and perform it later
+ *    headers: null,        Object of custom headers, eg {'X-Foo': 'Bar', 'X-Bar': 'Foo'}
+ *    promise: false        Whether return a Promise instance.
+ *              When true then next options is ignored: perform, onSuccess, onError, onComplete
+ *
+ *    onBefore:  (xhr) => {}            // Callback on before the request
+ *    onSuccess: (response, xhr) => {}, // Callback on the request success
+ *    onError:   (xhr) => {},           // Callback on the request error
+ *    onComplete: (xhr) => {},          // Callback on the request completed, with/without error
+ * }
+ *
+ * @return XMLHttpRequest|Boolean
+ *
+ * @example
+ *
+ *   Joomla.request({
+ *    url: 'index.php?option=com_example&view=example',
+ *    onSuccess: (response, xhr) => {
+ *     JSON.parse(response);
+ *    }
+ *   })
+ *
+ * @see    https://developer.mozilla.org/docs/Web/API/XMLHttpRequest
+ */
+Joomla.request = (options) => {
+  // Prepare the options
+  const newOptions = Joomla.extend({
+    url: '',
+    method: 'GET',
+    data: null,
+    perform: true,
+    promise: false,
+  }, options);
+
+  // Setup XMLHttpRequest instance
+  const createRequest = (onSuccess, onError) => {
+    const xhr = new XMLHttpRequest();
+
+    xhr.open(newOptions.method, newOptions.url, true);
+
+    // Set the headers
+    xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
+    xhr.setRequestHeader('X-Ajax-Engine', 'Joomla!');
+
+    if (newOptions.method !== 'GET') {
+      const token = Joomla.getOptions('csrf.token', '');
+
+      // Use the CSRF only on the site's domain
+      if (
+        token && (
+          (!newOptions.url.startsWith('http:') && !newOptions.url.startsWith('https:'))
+          || newOptions.url.startsWith(window.location.origin)
+        )
+      ) {
+        xhr.setRequestHeader('X-CSRF-Token', token);
+      }
 
-    elements.forEach((element) => {
-      if (element.type === 'hidden' && element.value === '1' && element.name.length === 32) {
-        element.name = newToken;
+      if (typeof newOptions.data === 'string' && (!newOptions.headers || !newOptions.headers['Content-Type'])) {
+        xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
       }
-    });
-  };
+    }
 
-  /**
-   * Method to perform AJAX request
-   *
-   * @param {Object} options   Request options:
-   * {
-   *    url:     'index.php', Request URL
-   *    method:  'GET',       Request method GET (default), POST
-   *    data:    null,        Data to be sent, see
-   *                https://developer.mozilla.org/docs/Web/API/XMLHttpRequest/send
-   *    perform: true,        Perform the request immediately
-   *              or return XMLHttpRequest instance and perform it later
-   *    headers: null,        Object of custom headers, eg {'X-Foo': 'Bar', 'X-Bar': 'Foo'}
-   *    promise: false        Whether return a Promise instance.
-   *              When true then next options is ignored: perform, onSuccess, onError, onComplete
-   *
-   *    onBefore:  (xhr) => {}            // Callback on before the request
-   *    onSuccess: (response, xhr) => {}, // Callback on the request success
-   *    onError:   (xhr) => {},           // Callback on the request error
-   *    onComplete: (xhr) => {},          // Callback on the request completed, with/without error
-   * }
-   *
-   * @return XMLHttpRequest|Boolean
-   *
-   * @example
-   *
-   *   Joomla.request({
-   *    url: 'index.php?option=com_example&view=example',
-   *    onSuccess: (response, xhr) => {
-   *     JSON.parse(response);
-   *    }
-   *   })
-   *
-   * @see    https://developer.mozilla.org/docs/Web/API/XMLHttpRequest
-   */
-  Joomla.request = (options) => {
-    // Prepare the options
-    const newOptions = Joomla.extend({
-      url: '',
-      method: 'GET',
-      data: null,
-      perform: true,
-      promise: false,
-    }, options);
-
-    // Setup XMLHttpRequest instance
-    const createRequest = (onSuccess, onError) => {
-      const xhr = new XMLHttpRequest();
-
-      xhr.open(newOptions.method, newOptions.url, true);
-
-      // Set the headers
-      xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
-      xhr.setRequestHeader('X-Ajax-Engine', 'Joomla!');
-
-      if (newOptions.method !== 'GET') {
-        const token = Joomla.getOptions('csrf.token', '');
-
-        // Use the CSRF only on the site's domain
-        if (
-          token && (
-            (!newOptions.url.startsWith('http:') && !newOptions.url.startsWith('https:'))
-            || newOptions.url.startsWith(window.location.origin)
-          )
-        ) {
-          xhr.setRequestHeader('X-CSRF-Token', token);
-        }
+    // Custom headers
+    if (newOptions.headers) {
+      [].slice.call(Object.keys(newOptions.headers)).forEach((key) => {
+        // Allow request without Content-Type
+        // eslint-disable-next-line no-empty
+        if (key === 'Content-Type' && newOptions.headers['Content-Type'] === 'false') {
 
-        if (typeof newOptions.data === 'string' && (!newOptions.headers || !newOptions.headers['Content-Type'])) {
-          xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+        } else {
+          xhr.setRequestHeader(key, newOptions.headers[key]);
         }
-      }
+      });
+    }
 
-      // Custom headers
-      if (newOptions.headers) {
-        [].slice.call(Object.keys(newOptions.headers)).forEach((key) => {
-          // Allow request without Content-Type
-          // eslint-disable-next-line no-empty
-          if (key === 'Content-Type' && newOptions.headers['Content-Type'] === 'false') {
-
-          } else {
-            xhr.setRequestHeader(key, newOptions.headers[key]);
-          }
-        });
+    xhr.onreadystatechange = () => {
+      // Request not finished
+      if (xhr.readyState !== 4) {
+        return;
       }
 
-      xhr.onreadystatechange = () => {
-        // Request not finished
-        if (xhr.readyState !== 4) {
-          return;
-        }
-
-        // Request finished and response is ready
-        if (xhr.status === 200) {
-          if (newOptions.promise) {
-            // A Promise accepts only one argument
-            onSuccess.call(window, xhr);
-          } else {
-            onSuccess.call(window, xhr.responseText, xhr);
-          }
+      // Request finished and response is ready
+      if (xhr.status === 200) {
+        if (newOptions.promise) {
+          // A Promise accepts only one argument
+          onSuccess.call(window, xhr);
         } else {
-          onError.call(window, xhr);
-        }
-
-        if (newOptions.onComplete && !newOptions.promise) {
-          newOptions.onComplete.call(window, xhr);
+          onSuccess.call(window, xhr.responseText, xhr);
         }
-      };
-
-      // Do request
-      if (newOptions.perform) {
-        if (newOptions.onBefore && newOptions.onBefore.call(window, xhr) === false) {
-          // Request interrupted
-          if (newOptions.promise) {
-            onSuccess.call(window, xhr);
-          }
-          return xhr;
-        }
-
-        xhr.send(newOptions.data);
+      } else {
+        onError.call(window, xhr);
       }
 
-      return xhr;
+      if (newOptions.onComplete && !newOptions.promise) {
+        newOptions.onComplete.call(window, xhr);
+      }
     };
 
-    // Return a Promise
-    if (newOptions.promise) {
-      return new Promise((resolve, reject) => {
-        newOptions.perform = true;
-        createRequest(resolve, reject);
-      });
-    }
+    // Do request
+    if (newOptions.perform) {
+      if (newOptions.onBefore && newOptions.onBefore.call(window, xhr) === false) {
+        // Request interrupted
+        if (newOptions.promise) {
+          onSuccess.call(window, xhr);
+        }
+        return xhr;
+      }
 
-    // Return a Request
-    try {
-      return createRequest(newOptions.onSuccess || (() => {}), newOptions.onError || (() => {}));
-    } catch (error) {
-      // eslint-disable-next-line no-unused-expressions,no-console
-      console.error(error);
-      return false;
+      xhr.send(newOptions.data);
     }
+
+    return xhr;
   };
 
-  let lastRequestPromise;
+  // Return a Promise
+  if (newOptions.promise) {
+    return new Promise((resolve, reject) => {
+      newOptions.perform = true;
+      createRequest(resolve, reject);
+    });
+  }
+
+  // Return a Request
+  try {
+    return createRequest(newOptions.onSuccess || (() => {}), newOptions.onError || (() => {}));
+  } catch (error) {
+    // eslint-disable-next-line no-unused-expressions,no-console
+    console.error(error);
+    return false;
+  }
+};
 
-  /**
-   * Joomla Request queue.
-   *
-   * A FIFO queue of requests to execute serially. Used to prevent simultaneous execution of
-   * multiple requests against the server which could trigger its Denial of Service protection.
-   *
-   * @param {object} options Options for Joomla.request()
-   * @returns {Promise}
-   */
-  Joomla.enqueueRequest = (options) => {
-    if (!options.promise) {
-      throw new Error('Joomla.enqueueRequest supports only Joomla.request as Promise');
-    }
-    if (!lastRequestPromise) {
-      lastRequestPromise = Joomla.request(options);
-    } else {
-      lastRequestPromise = lastRequestPromise.then(() => Joomla.request(options));
-    }
-    return lastRequestPromise;
-  };
+let lastRequestPromise;
 
-  /**
-   *
-   * @param {string} unsafeHtml The html for sanitization
-   * @param {object} allowList The list of HTMLElements with an array of allowed attributes
-   * @param {function} sanitizeFn A custom sanitization function
-   *
-   * @return string
-   */
-  Joomla.sanitizeHtml = (unsafeHtml, allowList, sanitizeFn) => {
-    const allowed = (allowList === undefined || allowList === null)
-      ? DefaultAllowlist : { ...DefaultAllowlist, ...allowList };
-    return sanitizeHtml(unsafeHtml, allowed, sanitizeFn);
-  };
+/**
+ * Joomla Request queue.
+ *
+ * A FIFO queue of requests to execute serially. Used to prevent simultaneous execution of
+ * multiple requests against the server which could trigger its Denial of Service protection.
+ *
+ * @param {object} options Options for Joomla.request()
+ * @returns {Promise}
+ */
+Joomla.enqueueRequest = (options) => {
+  if (!options.promise) {
+    throw new Error('Joomla.enqueueRequest supports only Joomla.request as Promise');
+  }
+  if (!lastRequestPromise) {
+    lastRequestPromise = Joomla.request(options);
+  } else {
+    lastRequestPromise = lastRequestPromise.then(() => Joomla.request(options));
+  }
+  return lastRequestPromise;
+};
 
-  /**
-   * Treat AJAX errors.
-   * Used by some javascripts such as sendtestmail.js and permissions.js
-   *
-   * @param   {object}  xhr         XHR object.
-   * @param   {string}  textStatus  Type of error that occurred.
-   * @param   {string}  error       Textual portion of the HTTP status.
-   *
-   * @return  {object}  JavaScript object containing the system error message.
-   *
-   * @since  3.6.0
-   */
-  Joomla.ajaxErrorsMessages = (xhr, textStatus) => {
-    const msg = {};
+/**
+ *
+ * @param {string} unsafeHtml The html for sanitization
+ * @param {object} allowList The list of HTMLElements with an array of allowed attributes
+ * @param {function} sanitizeFn A custom sanitization function
+ *
+ * @return string
+ */
+Joomla.sanitizeHtml = (unsafeHtml, allowList, sanitizeFn) => {
+  const allowed = (allowList === undefined || allowList === null)
+    ? DefaultAllowlist : { ...DefaultAllowlist, ...allowList };
+  return sanitizeHtml(unsafeHtml, allowed, sanitizeFn);
+};
 
-    if (textStatus === 'parsererror') {
-      // For jQuery jqXHR
-      const buf = [];
+/**
+ * Treat AJAX errors.
+ * Used by some javascripts such as sendtestmail.js and permissions.js
+ *
+ * @param   {object}  xhr         XHR object.
+ * @param   {string}  textStatus  Type of error that occurred.
+ * @param   {string}  error       Textual portion of the HTTP status.
+ *
+ * @return  {object}  JavaScript object containing the system error message.
+ *
+ * @since  3.6.0
+ */
+Joomla.ajaxErrorsMessages = (xhr, textStatus) => {
+  const msg = {};
 
-      // Html entity encode.
-      let encodedJson = xhr.responseText.trim();
+  if (textStatus === 'parsererror') {
+    // For jQuery jqXHR
+    const buf = [];
 
-      // eslint-disable-next-line no-plusplus
-      for (let i = encodedJson.length - 1; i >= 0; i--) {
-        buf.unshift(['&#', encodedJson[i].charCodeAt(), ';'].join(''));
-      }
+    // Html entity encode.
+    let encodedJson = xhr.responseText.trim();
 
-      encodedJson = buf.join('');
-
-      msg.error = [Joomla.Text._('JLIB_JS_AJAX_ERROR_PARSE').replace('%s', encodedJson)];
-    } else if (textStatus === 'nocontent') {
-      msg.error = [Joomla.Text._('JLIB_JS_AJAX_ERROR_NO_CONTENT')];
-    } else if (textStatus === 'timeout') {
-      msg.error = [Joomla.Text._('JLIB_JS_AJAX_ERROR_TIMEOUT')];
-    } else if (textStatus === 'abort') {
-      msg.error = [Joomla.Text._('JLIB_JS_AJAX_ERROR_CONNECTION_ABORT')];
-    } else if (xhr.responseJSON && xhr.responseJSON.message) {
-      // For vanilla XHR
-      msg.error = [`${Joomla.Text._('JLIB_JS_AJAX_ERROR_OTHER').replace('%s', xhr.status)} <em>${xhr.responseJSON.message}</em>`];
-    } else if (xhr.statusText) {
-      msg.error = [`${Joomla.Text._('JLIB_JS_AJAX_ERROR_OTHER').replace('%s', xhr.status)} <em>${xhr.statusText}</em>`];
-    } else {
-      msg.error = [Joomla.Text._('JLIB_JS_AJAX_ERROR_OTHER').replace('%s', xhr.status)];
+    // eslint-disable-next-line no-plusplus
+    for (let i = encodedJson.length - 1; i >= 0; i--) {
+      buf.unshift(['&#', encodedJson[i].charCodeAt(), ';'].join(''));
     }
 
-    return msg;
-  };
-})(Joomla);
+    encodedJson = buf.join('');
+
+    msg.error = [Joomla.Text._('JLIB_JS_AJAX_ERROR_PARSE').replace('%s', encodedJson)];
+  } else if (textStatus === 'nocontent') {
+    msg.error = [Joomla.Text._('JLIB_JS_AJAX_ERROR_NO_CONTENT')];
+  } else if (textStatus === 'timeout') {
+    msg.error = [Joomla.Text._('JLIB_JS_AJAX_ERROR_TIMEOUT')];
+  } else if (textStatus === 'abort') {
+    msg.error = [Joomla.Text._('JLIB_JS_AJAX_ERROR_CONNECTION_ABORT')];
+  } else if (xhr.responseJSON && xhr.responseJSON.message) {
+    // For vanilla XHR
+    msg.error = [`${Joomla.Text._('JLIB_JS_AJAX_ERROR_OTHER').replace('%s', xhr.status)} <em>${xhr.responseJSON.message}</em>`];
+  } else if (xhr.statusText) {
+    msg.error = [`${Joomla.Text._('JLIB_JS_AJAX_ERROR_OTHER').replace('%s', xhr.status)} <em>${xhr.statusText}</em>`];
+  } else {
+    msg.error = [Joomla.Text._('JLIB_JS_AJAX_ERROR_OTHER').replace('%s', xhr.status)];
+  }
+
+  return msg;
+};
diff --git a/build/media_source/system/js/fields/validate.es6.js b/build/media_source/system/js/fields/validate.es6.js
index 5412dc52bd15f..7a6dc220b071b 100644
--- a/build/media_source/system/js/fields/validate.es6.js
+++ b/build/media_source/system/js/fields/validate.es6.js
@@ -3,6 +3,8 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+'use strict';
+
 import punycode from 'punycode';
 
 class JFormValidator {
@@ -333,3 +335,10 @@ const initialize = () => {
 };
 
 document.addEventListener('DOMContentLoaded', initialize);
+
+/**
+ * Expose the classes to the global scope
+ * These will be removed in Joomla! 6.0
+ */
+window.JFormValidator = JFormValidator;
+window.punycode = punycode;
diff --git a/package-lock.json b/package-lock.json
index b9589d7db4a78..778a69b09d25c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "joomla",
-  "version": "4.4.4",
+  "version": "4.4.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "joomla",
-      "version": "4.4.4",
+      "version": "4.4.6",
       "hasInstallScript": true,
       "license": "GPL-2.0-or-later",
       "dependencies": {
@@ -33,7 +33,7 @@
         "mark.js": "^8.11.1",
         "mediaelement": "^5.1.1",
         "metismenujs": "^1.4.0",
-        "punycode": "^2.3.0",
+        "punycode": "^2.3.1",
         "qrcode-generator": "^1.4.4",
         "roboto-fontface": "^0.10.0",
         "shepherd.js": "^11.2.0",

From dfe907c6f32b061d52d531d241f2355a23fb938c Mon Sep 17 00:00:00 2001
From: Martina  Scholz <64533137+LadySolveig@users.noreply.github.com>
Date: Fri, 2 Aug 2024 01:00:17 +0200
Subject: [PATCH 19/32] [4.4] Fix missing $db->quoteName in FieldLayoutField
 (#43851)

* Fix missing quoteName in FieldLayoutField

* remove empty space

* Update administrator/components/com_fields/src/Field/FieldLayoutField.php
---
 .../components/com_fields/src/Field/FieldLayoutField.php    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/administrator/components/com_fields/src/Field/FieldLayoutField.php b/administrator/components/com_fields/src/Field/FieldLayoutField.php
index 7d652577131e2..eaf01ab2783a2 100644
--- a/administrator/components/com_fields/src/Field/FieldLayoutField.php
+++ b/administrator/components/com_fields/src/Field/FieldLayoutField.php
@@ -56,9 +56,9 @@ protected function getInput()
             // Build the query.
             $query->select('element, name')
                 ->from('#__extensions')
-                ->where('client_id = 0')
-                ->where('type = ' . $db->quote('template'))
-                ->where('enabled = 1');
+                ->where($db->quoteName('client_id') . ' = 0')
+                ->where($db->quoteName('type') . ' = ' . $db->quote('template'))
+                ->where($db->quoteName('enabled') . ' = 1');
 
             // Set the query and load the templates.
             $db->setQuery($query);

From 936d1eed9fd79801b95ed8c653151cee3667d7ca Mon Sep 17 00:00:00 2001
From: Quy <quy@nomonkeybiz.com>
Date: Fri, 2 Aug 2024 00:40:25 -0700
Subject: [PATCH 20/32] Fix syntax (#43818)

---
 administrator/components/com_users/src/Helper/Mfa.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_users/src/Helper/Mfa.php b/administrator/components/com_users/src/Helper/Mfa.php
index cd867b47c098c..a98eb8b737997 100644
--- a/administrator/components/com_users/src/Helper/Mfa.php
+++ b/administrator/components/com_users/src/Helper/Mfa.php
@@ -78,7 +78,7 @@ public static function getConfigurationInterface(User $user): ?string
         /** @var CMSApplication $app */
         $app = Factory::getApplication();
 
-        if (!$app->getInput()->getCmd('option', '') === 'com_users') {
+        if ($app->getInput()->getCmd('option', '') !== 'com_users') {
             $app->getLanguage()->load('com_users');
             $app->getDocument()
                 ->getWebAssetManager()

From 72025439ac3acfb0ec41c961573401f42b2e3ef5 Mon Sep 17 00:00:00 2001
From: David Jardin <d.jardin@djumla.de>
Date: Fri, 2 Aug 2024 11:04:43 +0200
Subject: [PATCH 21/32] [4.x] Fix com_content batch modal button logic (#43651)

* Fix com_content articles batch modal button logic

* remove check completly

---------
---
 .../components/com_content/src/View/Articles/HtmlView.php        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/administrator/components/com_content/src/View/Articles/HtmlView.php b/administrator/components/com_content/src/View/Articles/HtmlView.php
index 3857fd64d94c4..2dd90c647d4fe 100644
--- a/administrator/components/com_content/src/View/Articles/HtmlView.php
+++ b/administrator/components/com_content/src/View/Articles/HtmlView.php
@@ -234,7 +234,6 @@ protected function addToolbar()
             if (
                 $user->authorise('core.create', 'com_content')
                 && $user->authorise('core.edit', 'com_content')
-                && $user->authorise('core.execute.transition', 'com_content')
             ) {
                 $childBar->popupButton('batch', 'JTOOLBAR_BATCH')
                     ->selector('collapseModal')

From 69a65297f01ee305b135061522e298c2de997e13 Mon Sep 17 00:00:00 2001
From: Hans Kuijpers <hans2103@gmail.com>
Date: Fri, 2 Aug 2024 21:28:49 +0200
Subject: [PATCH 22/32] [4.4] fixing typo (#43875)

* [4.4] fixing typo

removal double "as"

* replace ' as as ' by ' as '
---
 .../components/com_content/src/Field/VotelistField.php          | 2 +-
 .../components/com_content/src/Field/VoteradioField.php         | 2 +-
 installation/src/Form/Field/Installation/LanguageField.php      | 2 +-
 libraries/src/Form/Field/TransitionField.php                    | 2 +-
 libraries/src/Form/Field/WorkflowconditionField.php             | 2 +-
 libraries/src/Form/Field/WorkflowstageField.php                 | 2 +-
 libraries/src/Form/FormField.php                                | 2 +-
 libraries/src/Form/FormRule.php                                 | 2 +-
 libraries/src/Form/Rule/SubformRule.php                         | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/administrator/components/com_content/src/Field/VotelistField.php b/administrator/components/com_content/src/Field/VotelistField.php
index 35ab56c415f7d..7fc097a6d4327 100644
--- a/administrator/components/com_content/src/Field/VotelistField.php
+++ b/administrator/components/com_content/src/Field/VotelistField.php
@@ -37,7 +37,7 @@ class VotelistField extends ListField
      *
      * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
      * @param   mixed              $value    The form field value to validate.
-     * @param   string             $group    The field name group control value. This acts as as an array container for the field.
+     * @param   string             $group    The field name group control value. This acts as an array container for the field.
      *                                       For example if the field has name="foo" and the group value is set to "bar" then the
      *                                       full field name would end up being "bar[foo]".
      *
diff --git a/administrator/components/com_content/src/Field/VoteradioField.php b/administrator/components/com_content/src/Field/VoteradioField.php
index 5e02579a8b60a..8c654138ec0df 100644
--- a/administrator/components/com_content/src/Field/VoteradioField.php
+++ b/administrator/components/com_content/src/Field/VoteradioField.php
@@ -37,7 +37,7 @@ class VoteradioField extends RadioField
      *
      * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
      * @param   mixed              $value    The form field value to validate.
-     * @param   string             $group    The field name group control value. This acts as as an array container for the field.
+     * @param   string             $group    The field name group control value. This acts as an array container for the field.
      *                                       For example if the field has name="foo" and the group value is set to "bar" then the
      *                                       full field name would end up being "bar[foo]".
      *
diff --git a/installation/src/Form/Field/Installation/LanguageField.php b/installation/src/Form/Field/Installation/LanguageField.php
index ee0792a0b830f..19189e83f7e78 100644
--- a/installation/src/Form/Field/Installation/LanguageField.php
+++ b/installation/src/Form/Field/Installation/LanguageField.php
@@ -38,7 +38,7 @@ class LanguageField extends ListField
      *
      * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
      * @param   mixed              $value    The form field value to validate.
-     * @param   string             $group    The field name group control value. This acts as as an array container for the field.
+     * @param   string             $group    The field name group control value. This acts as an array container for the field.
      *                                       For example if the field has name="foo" and the group value is set to "bar" then the
      *                                       full field name would end up being "bar[foo]".
      *
diff --git a/libraries/src/Form/Field/TransitionField.php b/libraries/src/Form/Field/TransitionField.php
index cc21fe9ab0594..42ee794f3c439 100644
--- a/libraries/src/Form/Field/TransitionField.php
+++ b/libraries/src/Form/Field/TransitionField.php
@@ -53,7 +53,7 @@ class TransitionField extends GroupedlistField
      *
      * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
      * @param   mixed              $value    The form field value to validate.
-     * @param   string             $group    The field name group control value. This acts as as an array container for the field.
+     * @param   string             $group    The field name group control value. This acts as an array container for the field.
      *                                       For example if the field has name="foo" and the group value is set to "bar" then the
      *                                       full field name would end up being "bar[foo]".
      *
diff --git a/libraries/src/Form/Field/WorkflowconditionField.php b/libraries/src/Form/Field/WorkflowconditionField.php
index 55a07674afe8a..b0aacdc21598e 100644
--- a/libraries/src/Form/Field/WorkflowconditionField.php
+++ b/libraries/src/Form/Field/WorkflowconditionField.php
@@ -53,7 +53,7 @@ class WorkflowconditionField extends ListField
      *
      * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
      * @param   mixed              $value    The form field value to validate.
-     * @param   string             $group    The field name group control value. This acts as as an array container for the field.
+     * @param   string             $group    The field name group control value. This acts as an array container for the field.
      *                                       For example if the field has name="foo" and the group value is set to "bar" then the
      *                                       full field name would end up being "bar[foo]".
      *
diff --git a/libraries/src/Form/Field/WorkflowstageField.php b/libraries/src/Form/Field/WorkflowstageField.php
index 0651d32416848..6145028899086 100644
--- a/libraries/src/Form/Field/WorkflowstageField.php
+++ b/libraries/src/Form/Field/WorkflowstageField.php
@@ -53,7 +53,7 @@ class WorkflowstageField extends GroupedlistField
      *
      * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
      * @param   mixed              $value    The form field value to validate.
-     * @param   string             $group    The field name group control value. This acts as as an array container for the field.
+     * @param   string             $group    The field name group control value. This acts as an array container for the field.
      *                                       For example if the field has name="foo" and the group value is set to "bar" then the
      *                                       full field name would end up being "bar[foo]".
      *
diff --git a/libraries/src/Form/FormField.php b/libraries/src/Form/FormField.php
index e724b4fb9390c..089f26d661f23 100644
--- a/libraries/src/Form/FormField.php
+++ b/libraries/src/Form/FormField.php
@@ -616,7 +616,7 @@ public function setForm(Form $form)
      *
      * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
      * @param   mixed              $value    The form field value to validate.
-     * @param   string             $group    The field name group control value. This acts as as an array container for the field.
+     * @param   string             $group    The field name group control value. This acts as an array container for the field.
      *                                       For example if the field has name="foo" and the group value is set to "bar" then the
      *                                       full field name would end up being "bar[foo]".
      *
diff --git a/libraries/src/Form/FormRule.php b/libraries/src/Form/FormRule.php
index 1e3e1126fff27..200b0c73926af 100644
--- a/libraries/src/Form/FormRule.php
+++ b/libraries/src/Form/FormRule.php
@@ -58,7 +58,7 @@ class FormRule
      *
      * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
      * @param   mixed              $value    The form field value to validate.
-     * @param   string             $group    The field name group control value. This acts as as an array container for the field.
+     * @param   string             $group    The field name group control value. This acts as an array container for the field.
      *                                       For example if the field has name="foo" and the group value is set to "bar" then the
      *                                       full field name would end up being "bar[foo]".
      * @param   ?Registry          $input    An optional Registry object with the entire data set to validate against the entire form.
diff --git a/libraries/src/Form/Rule/SubformRule.php b/libraries/src/Form/Rule/SubformRule.php
index 2749952de71f5..ae58f30d56db3 100644
--- a/libraries/src/Form/Rule/SubformRule.php
+++ b/libraries/src/Form/Rule/SubformRule.php
@@ -30,7 +30,7 @@ class SubformRule extends FormRule
      *
      * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
      * @param   mixed              $value    The form field value to validate.
-     * @param   string             $group    The field name group control value. This acts as as an array container for the field.
+     * @param   string             $group    The field name group control value. This acts as an array container for the field.
      *                                       For example if the field has name="foo" and the group value is set to "bar" then the
      *                                       full field name would end up being "bar[foo]".
      * @param   ?Registry          $input    An optional Registry object with the entire data set to validate against the entire form.

From 789ed1948208d255ee359dfffeb6d37518c12c6c Mon Sep 17 00:00:00 2001
From: Fedir Zinchuk <getthesite@gmail.com>
Date: Mon, 5 Aug 2024 16:37:51 +0300
Subject: [PATCH 23/32] Multiselect do not interfere with interactive elements
 (#43574)

---
 build/media_source/system/js/multiselect.es6.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/build/media_source/system/js/multiselect.es6.js b/build/media_source/system/js/multiselect.es6.js
index 46af672389fab..fb07448bf7f81 100644
--- a/build/media_source/system/js/multiselect.es6.js
+++ b/build/media_source/system/js/multiselect.es6.js
@@ -46,10 +46,8 @@ class JMultiSelect {
 
   // Handle click on a row
   onRowClick({ target, shiftKey }) {
-    // Do not interfere with links, buttons, inputs
-    if (target.tagName && (target.tagName === 'A' || target.tagName === 'BUTTON'
-      || target.tagName === 'SELECT' || target.tagName === 'TEXTAREA'
-      || (target.tagName === 'INPUT' && !target.matches(this.boxSelector)))) {
+    // Do not interfere with links, buttons, inputs and other interactive elements
+    if (target.closest('a, button, input, select, textarea, details, dialog, audio, video')) {
       return;
     }
 

From c73f790583e5cca44bbe9cfab9f931923ab9073c Mon Sep 17 00:00:00 2001
From: Fedir Zinchuk <getthesite@gmail.com>
Date: Mon, 5 Aug 2024 17:48:02 +0300
Subject: [PATCH 24/32] [4.4] Fix SQL field, get the filter value from the
 linked filter field (#43789)

* Fix SQL field, get the filter value from the linked filter field

* cs

* esc

---------
---
 libraries/src/Form/Field/SqlField.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/libraries/src/Form/Field/SqlField.php b/libraries/src/Form/Field/SqlField.php
index f6a088324c083..8e56d3d3a6a58 100644
--- a/libraries/src/Form/Field/SqlField.php
+++ b/libraries/src/Form/Field/SqlField.php
@@ -233,12 +233,21 @@ protected function processQuery($conditions, $filters, $defaults)
 
         // Process the filters
         if (\is_array($filters)) {
-            $html_filters = Factory::getApplication()->getUserStateFromRequest($this->context . '.filter', 'filter', [], 'array');
+            // @TODO: Loading the filtering value from the request need to be deprecated.
+            $html_filters = $this->context ? Factory::getApplication()->getUserStateFromRequest($this->context . '.filter', 'filter', [], 'array') : false;
+            $form         = $this->form;
 
             foreach ($filters as $k => $value) {
-                if (!empty($html_filters[$value])) {
+                // Get the filter value from the linked filter field
+                $filterFieldValue = $form->getValue($value, $this->group);
+
+                if ($html_filters && !empty($html_filters[$value])) {
                     $escape = $db->quote($db->escape($html_filters[$value]), false);
 
+                    $query->where("{$value} = {$escape}");
+                } elseif ($filterFieldValue !== null) {
+                    $escape = $db->quote($db->escape($filterFieldValue), false);
+
                     $query->where("{$value} = {$escape}");
                 } elseif (!empty($defaults[$value])) {
                     $escape = $db->quote($db->escape($defaults[$value]), false);

From 23afb6da28df8c093799e8cbb806ccab292813c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Heiko=20L=C3=BCbbe?= <github@heikol.de>
Date: Tue, 6 Aug 2024 10:50:31 +0200
Subject: [PATCH 25/32] Checking id is set as down-merge from 5.1-dev (#43879)

---
 components/com_newsfeeds/src/View/Category/HtmlView.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/com_newsfeeds/src/View/Category/HtmlView.php b/components/com_newsfeeds/src/View/Category/HtmlView.php
index 0ae24da04f4c3..f9a7b1f08477e 100644
--- a/components/com_newsfeeds/src/View/Category/HtmlView.php
+++ b/components/com_newsfeeds/src/View/Category/HtmlView.php
@@ -88,8 +88,9 @@ protected function prepareDocument()
             $category = $this->category->getParent();
 
             while (
-                (!isset($menu->query['option']) || $menu->query['option'] !== 'com_newsfeeds' || $menu->query['view'] === 'newsfeed'
-                || $id != $category->id) && $category->id > 1
+                isset($category->id) && $category->id > 1
+                && (!isset($menu->query['option']) || $menu->query['option'] !== 'com_newsfeeds' || $menu->query['view'] === 'newsfeed'
+                || $id != $category->id)
             ) {
                 $path[]   = ['title' => $category->title, 'link' => RouteHelper::getCategoryRoute($category->id, $category->language)];
                 $category = $category->getParent();

From fd67382839f1b49b0754ea81a1fdc95a7820ac70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Heiko=20L=C3=BCbbe?= <github@heikol.de>
Date: Tue, 6 Aug 2024 10:54:22 +0200
Subject: [PATCH 26/32] Setting publish_up in db_createArticle (#43881)

as down-merge from 5.1-dev

Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
---
 tests/System/support/commands/db.mjs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/System/support/commands/db.mjs b/tests/System/support/commands/db.mjs
index 64710fda0083a..16fff4ce000c1 100644
--- a/tests/System/support/commands/db.mjs
+++ b/tests/System/support/commands/db.mjs
@@ -102,6 +102,7 @@ Cypress.Commands.add('db_createArticle', (articleData) => {
     language: '*',
     created: '2023-01-01 20:00:00',
     modified: '2023-01-01 20:00:00',
+    publish_up: '2023-01-01 20:00:00',
     images: '',
     urls: '',
     attribs: '',

From 897f05b2bfe209b9cf74a196359f1380408b83f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Heiko=20L=C3=BCbbe?= <github@heikol.de>
Date: Tue, 6 Aug 2024 10:54:42 +0200
Subject: [PATCH 27/32] Checking id is set as down-merge from 5.1-dev (#43880)

---
 components/com_newsfeeds/src/View/Newsfeed/HtmlView.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php b/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php
index e02e4a038db43..f1584a545279a 100644
--- a/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php
+++ b/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php
@@ -260,8 +260,9 @@ protected function _prepareDocument()
             $category = Categories::getInstance('Newsfeeds')->get($this->item->catid);
 
             while (
-                (!isset($menu->query['option']) || $menu->query['option'] !== 'com_newsfeeds' || $menu->query['view'] === 'newsfeed'
-                || $id != $category->id) && $category->id > 1
+                isset($category->id) && $category->id > 1
+                && (!isset($menu->query['option']) || $menu->query['option'] !== 'com_newsfeeds' || $menu->query['view'] === 'newsfeed'
+                || $id != $category->id)
             ) {
                 $path[]   = ['title' => $category->title, 'link' => RouteHelper::getCategoryRoute($category->id)];
                 $category = $category->getParent();

From 2f275c0a4a3731a919a9a716aff64d6a7ee14148 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Artur=20St=C4=99pie=C5=84?= <artur.stepien@bestproject.pl>
Date: Tue, 6 Aug 2024 14:52:00 +0200
Subject: [PATCH 28/32] Update Captcha.php (#43888)

---
 libraries/src/Captcha/Captcha.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/src/Captcha/Captcha.php b/libraries/src/Captcha/Captcha.php
index 5a39d7a440af6..e8974b84f275a 100644
--- a/libraries/src/Captcha/Captcha.php
+++ b/libraries/src/Captcha/Captcha.php
@@ -41,7 +41,7 @@ class Captcha implements DispatcherAwareInterface
     private $captcha;
 
     /**
-     * Editor Plugin name
+     * Captcha Plugin name
      *
      * @var    string
      * @since  2.5
@@ -233,10 +233,10 @@ private function _load(array $options = [])
         // Build the path to the needed captcha plugin
         $name = InputFilter::getInstance()->clean($this->name, 'cmd');
 
-        // Boot the editor plugin
+        // Boot the captcha plugin
         $this->captcha = Factory::getApplication()->bootPlugin($name, 'captcha');
 
-        // Check if the editor can be loaded
+        // Check if the captcha can be loaded
         if (!$this->captcha) {
             throw new \RuntimeException(Text::sprintf('JLIB_CAPTCHA_ERROR_PLUGIN_NOT_FOUND', $name));
         }

From 98a4b2a2cfa1a425131f5f0565459d8ef21ee87c Mon Sep 17 00:00:00 2001
From: Fedir Zinchuk <getthesite@gmail.com>
Date: Tue, 6 Aug 2024 16:44:50 +0300
Subject: [PATCH 29/32] Revert 42934 (#43827)

---
 plugins/content/vote/tmpl/rating.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/content/vote/tmpl/rating.php b/plugins/content/vote/tmpl/rating.php
index e0f2a78b290ca..df37497f05e55 100644
--- a/plugins/content/vote/tmpl/rating.php
+++ b/plugins/content/vote/tmpl/rating.php
@@ -79,8 +79,7 @@
 ?>
 <div class="content_rating" role="img" aria-label="<?php echo Text::sprintf('PLG_VOTE_STAR_RATING', $rating); ?>">
     <?php if ($rcount) : ?>
-        <div class="visually-hidden" itemscope itemtype="https://schema.org/Product">
-            <span itemprop="name"><?php echo $row->title; ?></span>
+        <div class="visually-hidden">
             <p itemprop="aggregateRating" itemscope itemtype="https://schema.org/AggregateRating">
                 <?php echo Text::sprintf('PLG_VOTE_USER_RATING', '<span itemprop="ratingValue">' . $rating . '</span>', '<span itemprop="bestRating">5</span>'); ?>
                 <meta itemprop="ratingCount" content="<?php echo $rcount; ?>">

From 46c3bc031670aa0550ebbc7e738d73ab3c349782 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Heiko=20L=C3=BCbbe?= <github@heikol.de>
Date: Wed, 7 Aug 2024 18:41:20 +0200
Subject: [PATCH 30/32] [4.4] Use joomla-cypress 1.1.1 (#43722)

* [cypress] Updated to joomla-cypress 1.1.0

The joomla-cypress NPM package used has been updated to the latest version in order to be able to use one version in all active joomla-cms branches.
Other packages were also updated to the latest versions with the `npm update`.
The overwritten Cypress commands for faster login with session have been deleted, as they are already included in the new joomla-cypress version.

* Hack to prevent deprecated in mod_related_items

* 3 more files with workarounds

* no hack for modules

* avoid hacks

* avoid hacks

* featured

* featured

* module

* nomore

* nomore

* Fix missing apostrophe

* NPM Update only joomla-cypress

npm install joomla-cypress@1.1.0

* Update tests/System/README.md

Removed notice on overridden joomla-cypress commands

* Fixing lint:testjs errors

* Undo the changes extracted to a separate PRs

* npm update joomla-cypress 1.1.1

---------

Co-authored-by: Nicola Galgano <optimus4joomla@gmail.com>
Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
---
 package-lock.json                 | 60 +++++++++++++++++--------------
 package.json                      |  4 +--
 tests/System/README.md            |  4 ---
 tests/System/support/commands.mjs | 54 +---------------------------
 4 files changed, 36 insertions(+), 86 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 778a69b09d25c..ca3963e87f6c7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "joomla",
-  "version": "4.4.6",
+  "version": "4.4.7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "joomla",
-      "version": "4.4.6",
+      "version": "4.4.7",
       "hasInstallScript": true,
       "license": "GPL-2.0-or-later",
       "dependencies": {
@@ -66,7 +66,7 @@
         "fs-extra": "^10.1.0",
         "ini": "^2.0.0",
         "jasmine-core": "^3.99.1",
-        "joomla-cypress": "^0.0.16",
+        "joomla-cypress": "^1.1.1",
         "lightningcss": "^1.22.1",
         "mysql": "^2.18.1",
         "postcss": "^8.4.30",
@@ -3908,21 +3908,20 @@
       "integrity": "sha512-GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg=="
     },
     "node_modules/cypress": {
-      "version": "13.2.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.2.0.tgz",
-      "integrity": "sha512-AvDQxBydE771GTq0TR4ZUBvv9m9ffXuB/ueEtpDF/6gOcvFR96amgwSJP16Yhqw6VhmwqspT5nAGzoxxB+D89g==",
+      "version": "13.13.2",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.13.2.tgz",
+      "integrity": "sha512-PvJQU33933NvS1StfzEb8/mu2kMy4dABwCF+yd5Bi7Qly1HOVf+Bufrygee/tlmty/6j5lX+KIi8j9Q3JUMbhA==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
-        "@cypress/request": "^3.0.0",
+        "@cypress/request": "^3.0.1",
         "@cypress/xvfb": "^1.2.4",
-        "@types/node": "^18.17.5",
         "@types/sinonjs__fake-timers": "8.1.1",
         "@types/sizzle": "^2.3.2",
         "arch": "^2.2.0",
         "blob-util": "^2.0.2",
         "bluebird": "^3.7.2",
-        "buffer": "^5.6.0",
+        "buffer": "^5.7.1",
         "cachedir": "^2.3.0",
         "chalk": "^4.1.0",
         "check-more-types": "^2.24.0",
@@ -3940,7 +3939,7 @@
         "figures": "^3.2.0",
         "fs-extra": "^9.1.0",
         "getos": "^3.2.1",
-        "is-ci": "^3.0.0",
+        "is-ci": "^3.0.1",
         "is-installed-globally": "~0.4.0",
         "lazy-ass": "^1.6.0",
         "listr2": "^3.8.3",
@@ -3954,7 +3953,7 @@
         "request-progress": "^3.0.0",
         "semver": "^7.5.3",
         "supports-color": "^8.1.1",
-        "tmp": "~0.2.1",
+        "tmp": "~0.2.3",
         "untildify": "^4.0.0",
         "yauzl": "^2.10.0"
       },
@@ -3965,11 +3964,17 @@
         "node": "^16.0.0 || ^18.0.0 || >=20.0.0"
       }
     },
-    "node_modules/cypress/node_modules/@types/node": {
-      "version": "18.17.18",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.18.tgz",
-      "integrity": "sha512-/4QOuy3ZpV7Ya1GTRz5CYSz3DgkKpyUptXuQ5PPce7uuyJAOR7r9FhkmxJfvcNUXyklbC63a+YvB3jxy7s9ngw==",
-      "dev": true
+    "node_modules/cypress-file-upload": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/cypress-file-upload/-/cypress-file-upload-5.0.8.tgz",
+      "integrity": "sha512-+8VzNabRk3zG6x8f8BWArF/xA/W0VK4IZNx3MV0jFWrJS/qKn8eHfa5nU73P9fOQAgwHFJx7zjg4lwOnljMO8g==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.2.1"
+      },
+      "peerDependencies": {
+        "cypress": ">3.0.0"
+      }
     },
     "node_modules/cypress/node_modules/ansi-styles": {
       "version": "4.3.0",
@@ -6314,10 +6319,14 @@
       "dev": true
     },
     "node_modules/joomla-cypress": {
-      "version": "0.0.16",
-      "resolved": "https://registry.npmjs.org/joomla-cypress/-/joomla-cypress-0.0.16.tgz",
-      "integrity": "sha512-Ku+ykwChSklRmmIhRMeGmVk4vLCUG2TWAAUseFMo8Yg0cD1jB9csK4pTiwwOBhx7TvT3Sps/RFk68eh3y/cTJw==",
-      "dev": true
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/joomla-cypress/-/joomla-cypress-1.1.1.tgz",
+      "integrity": "sha512-F+suvN5CULRmUeJmkOW4pbIhtJQnuer2C7HoLGbjGF6KbHiHTbhtoDe0cY5qFfE7K+2+CRunKUzUU+cU/gchWw==",
+      "dev": true,
+      "dependencies": {
+        "cypress": "^13.13.2",
+        "cypress-file-upload": "^5.0.8"
+      }
     },
     "node_modules/joomla-ui-custom-elements": {
       "version": "0.2.0",
@@ -9440,15 +9449,12 @@
       }
     },
     "node_modules/tmp": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
-      "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
+      "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==",
       "dev": true,
-      "dependencies": {
-        "rimraf": "^3.0.0"
-      },
       "engines": {
-        "node": ">=8.17.0"
+        "node": ">=14.14"
       }
     },
     "node_modules/to-fast-properties": {
diff --git a/package.json b/package.json
index de22c7687e3e4..c86b568114dc5 100644
--- a/package.json
+++ b/package.json
@@ -92,7 +92,7 @@
     "fs-extra": "^10.1.0",
     "ini": "^2.0.0",
     "jasmine-core": "^3.99.1",
-    "joomla-cypress": "^0.0.16",
+    "joomla-cypress": "^1.1.1",
     "lightningcss": "^1.22.1",
     "mysql": "^2.18.1",
     "postcss": "^8.4.30",
@@ -111,4 +111,4 @@
     "stylelint-order": "^5.0.0",
     "stylelint-scss": "^4.7.0"
   }
-}
\ No newline at end of file
+}
diff --git a/tests/System/README.md b/tests/System/README.md
index e10172abfe791..a009c0d488536 100644
--- a/tests/System/README.md
+++ b/tests/System/README.md
@@ -122,10 +122,6 @@ SMTP configuration.
 
 The used npm package "Helpers for using Cypress with Joomla for testing" **[joomala-cypress](https://github.com/joomla-projects/joomla-cypress/)** helps in writing the Cypress tests for Joomla in extending the Cypress API with custom commands.
 
-> [!IMPORTANT]
-> Some `joomala-cypress` commands are overwritten by the System Tests,
-> see [tests/System/support/commands.js](/tests/System/support/commands.js).
-
 The **[smtp-tester](https://www.npmjs.com/package/smtp-tester)** npm package creates an SMTP server that listens
 on the `smtp_port` specified in `cypress.config.mjs` during test runtime.
 This server accepts connections, receives emails, and provides the capability to check the received emails during the test.
diff --git a/tests/System/support/commands.mjs b/tests/System/support/commands.mjs
index 3f1300fed4c37..3e6d34a51f85a 100644
--- a/tests/System/support/commands.mjs
+++ b/tests/System/support/commands.mjs
@@ -1,5 +1,5 @@
 /**
- * Imports commands fom files. The commands start with the folder name and an underscore as cypress doesn't support
+ * Imports commands from files. The commands start with the folder name and an underscore as Cypress doesn't support
  * namespaces for commands.
  *
  * https://github.com/cypress-io/cypress/issues/6575
@@ -12,55 +12,3 @@ import './commands/config.mjs';
 import './commands/db.mjs';
 
 registerCommands();
-
-Cypress.Commands.overwrite('doFrontendLogin', (originalFn, username, password, useSnapshot = true) => {
-  // Ensure there are valid credentials
-  const user = username ?? Cypress.env('username');
-  const pw = password ?? Cypress.env('password');
-
-  // Do normal login when no snapshot should be used
-  if (!useSnapshot) {
-    // Clear the session data
-    Cypress.session.clearAllSavedSessions();
-
-    // Call the normal function
-    return originalFn(user, pw);
-  }
-
-  // Do login through the session
-  return cy.session([user, pw, 'front'], () => originalFn(user, pw), { cacheAcrossSpecs: true });
-});
-
-Cypress.Commands.overwrite('doFrontendLogout', (originalFn) => {
-  // Call the login function
-  originalFn();
-
-  // Clear the session data
-  Cypress.session.clearAllSavedSessions();
-});
-
-Cypress.Commands.overwrite('doAdministratorLogin', (originalFn, username, password, useSnapshot = true) => {
-  // Ensure there are valid credentials
-  const user = username ?? Cypress.env('username');
-  const pw = password ?? Cypress.env('password');
-
-  // Do normal login when no snapshot should be used
-  if (!useSnapshot) {
-    // Clear the session data
-    Cypress.session.clearAllSavedSessions();
-
-    // Call the normal function
-    return originalFn(user, pw);
-  }
-
-  // Do login through the session
-  return cy.session([user, pw, 'back'], () => originalFn(user, pw), { cacheAcrossSpecs: true });
-});
-
-Cypress.Commands.overwrite('doAdministratorLogout', (originalFn) => {
-  // Call the login function
-  originalFn();
-
-  // Clear the session data
-  Cypress.session.clearAllSavedSessions();
-});

From 2284c095fcc2fb6579f183a4472146a7d4b3e0e1 Mon Sep 17 00:00:00 2001
From: Hans Kuijpers <hans2103@gmail.com>
Date: Fri, 9 Aug 2024 08:31:50 +0200
Subject: [PATCH 31/32] [4.0] close collapse when opening a dropdown (#43891)

* make sure you click on the button, not any of the children

* close collapse when click to open a dropdown

* fix lint:js issues

* Update build/media_source/templates/administrator/atum/js/template.es6.js

Co-authored-by: Brian Teeman <brian@teeman.net>

---------

Co-authored-by: Brian Teeman <brian@teeman.net>
---
 .../administrator/atum/js/template.es6.js       | 17 +++++++++++++++++
 .../site/cassiopeia/scss/blocks/_header.scss    |  4 ++++
 .../site/cassiopeia/scss/blocks/_toolbar.scss   |  4 ++++
 3 files changed, 25 insertions(+)

diff --git a/build/media_source/templates/administrator/atum/js/template.es6.js b/build/media_source/templates/administrator/atum/js/template.es6.js
index 23a4cb1b6086c..2ef85491d0cd5 100644
--- a/build/media_source/templates/administrator/atum/js/template.es6.js
+++ b/build/media_source/templates/administrator/atum/js/template.es6.js
@@ -242,3 +242,20 @@ window.addEventListener('joomla:menu-toggle', (event) => {
     changeLogo(event.detail);
   }
 });
+
+/**
+ * Close any open data-bs-toggle="collapse" when opening a data-bs-toggle="dropdown"
+ *
+ * @since 4.4
+ */
+document.querySelectorAll('[data-bs-toggle="dropdown"]').forEach((button) => {
+  button.addEventListener('click', () => {
+    document.querySelectorAll('[data-bs-toggle="collapse"]').forEach((cb) => {
+      const target = document.querySelector(cb.getAttribute('data-bs-target'));
+      const collapseMenu = bootstrap.Collapse.getInstance(target) || new bootstrap.Collapse(target, {
+        toggle: false,
+      });
+      collapseMenu.hide();
+    });
+  });
+});
diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_header.scss b/build/media_source/templates/site/cassiopeia/scss/blocks/_header.scss
index ece7792b12ba3..34271e4aa36ce 100644
--- a/build/media_source/templates/site/cassiopeia/scss/blocks/_header.scss
+++ b/build/media_source/templates/site/cassiopeia/scss/blocks/_header.scss
@@ -204,6 +204,10 @@
     .fas {
       font-size: 1.5rem;
     }
+
+    > * {
+      pointer-events: none;
+    }
   }
 
   .container-search {
diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_toolbar.scss b/build/media_source/templates/site/cassiopeia/scss/blocks/_toolbar.scss
index cc993c9772146..07ce5ac6d69e4 100644
--- a/build/media_source/templates/site/cassiopeia/scss/blocks/_toolbar.scss
+++ b/build/media_source/templates/site/cassiopeia/scss/blocks/_toolbar.scss
@@ -119,6 +119,10 @@
     &.btn {
       padding-inline-end: 0;
     }
+
+    > * {
+      pointer-events: none;
+    }
   }
 
   .btn-group:not(:last-child) > .dropdown-toggle-split {

From 7aaa9d3f99f40dbfb535edae94b9fad6f77cbb1f Mon Sep 17 00:00:00 2001
From: Hannes Papenberg <info@joomlager.de>
Date: Fri, 9 Aug 2024 09:33:03 +0300
Subject: [PATCH 32/32] [4.4] Form Text Field: Translate text for frontend
 validation (#43198)

* Form Text Field: Translate text for frontend validation

* Update text.php

---------

Co-authored-by: Quy <quy@nomonkeybiz.com>
---
 layouts/joomla/form/field/text.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layouts/joomla/form/field/text.php b/layouts/joomla/form/field/text.php
index cba5f453b9e6f..4dcaf2c4fce1f 100644
--- a/layouts/joomla/form/field/text.php
+++ b/layouts/joomla/form/field/text.php
@@ -95,7 +95,7 @@
     !empty($pattern) ? 'pattern="' . $pattern . '"' : '',
 
     // @TODO add a proper string here!!!
-    !empty($validationtext) ? 'data-validation-text="' . $validationtext . '"' : '',
+    !empty($validationtext) ? 'data-validation-text="' . $this->escape(Text::_($validationtext)) . '"' : '',
 ];
 
 $addonBeforeHtml = '<span class="input-group-text">' . Text::_($addonBefore) . '</span>';