Joomla! 5.1.2 Stable

joomla · Jul 8, 2024 · 6a587ce · 6a587ce
1 parent 3d130ac
commit 6a587ce
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 13 deletions.
diff --git 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

diff --git 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>5.1.2-rc3-dev</version>
+	<version>5.1.2</version>
 	<creationDate>2024-07</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 

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
@@ -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

diff --git 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/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

diff --git 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);

diff --git a/libraries/src/Version.php b/libraries/src/Version.php
@@ -66,15 +66,15 @@ final class Version
      * @var    string
      * @since  3.8.0
      */
-    public const EXTRA_VERSION = 'rc3-dev';
+    public const EXTRA_VERSION = '';
 
     /**
      * Development status.
      *
      * @var    string
      * @since  3.5
      */
-    public const DEV_STATUS = 'Development';
+    public const DEV_STATUS = 'Stable';
 
     /**
      * Code name.
@@ -90,15 +90,15 @@ final class Version
      * @var    string
      * @since  3.5
      */
-    public const RELDATE = '8-July-2024';
+    public const RELDATE = '9-July-2024';
 
     /**
      * Release time.
      *
      * @var    string
      * @since  3.5
      */
-    public const RELTIME = '09:45';
+    public const RELTIME = '16:00';
 
     /**
      * Release timezone.

diff --git 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"
 				/>

diff --git a/package-lock.json b/package-lock.json