Merge branch 'staging' into fields-language-strings

joomla · Jul 10, 2019 · b05667d · b05667d
2 parents a7289a5 + df135dc
commit b05667d
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 11 deletions.
diff --git a/administrator/language/en-GB/en-GB.xml b/administrator/language/en-GB/en-GB.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile version="3.8" client="administrator">
 	<name>English (en-GB)</name>
-	<version>3.9.9</version>
+	<version>3.9.10</version>
 	<creationDate>July 2019</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml
@@ -2,7 +2,7 @@
 <extension version="3.8" client="administrator" type="language" method="upgrade">
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
-	<version>3.9.9</version>
+	<version>3.9.10</version>
 	<creationDate>July 2019</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

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) 2005 - 2019 Open Source Matters. All rights reserved</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>3.9.9-dev</version>
+	<version>3.9.10-dev</version>
 	<creationDate>July 2019</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
@@ -2,7 +2,7 @@
 <extension type="package" version="3.8" method="upgrade">
 	<name>English (en-GB) Language Pack</name>
 	<packagename>en-GB</packagename>
-	<version>3.9.9.1</version>
+	<version>3.9.10.1</version>
 	<creationDate>July 2019</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

diff --git a/installation/language/en-GB/en-GB.xml b/installation/language/en-GB/en-GB.xml
@@ -3,7 +3,7 @@
 	version="3.8"
 	client="installation">
 	<name>English (United Kingdom)</name>
-	<version>3.9.9</version>
+	<version>3.9.10</version>
 	<creationDate>July 2019</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>

diff --git a/language/en-GB/en-GB.xml b/language/en-GB/en-GB.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile version="3.8" client="site">
 	<name>English (en-GB)</name>
-	<version>3.9.9</version>
+	<version>3.9.10</version>
 	<creationDate>July 2019</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml
@@ -2,7 +2,7 @@
 <extension version="3.8" client="site" type="language" method="upgrade">
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
-	<version>3.9.9</version>
+	<version>3.9.10</version>
 	<creationDate>July 2019</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

diff --git a/libraries/src/Form/Form.php b/libraries/src/Form/Form.php
@@ -2145,6 +2145,41 @@ protected function validateField(\SimpleXMLElement $element, $group = null, $val
 			}
 		}
 
+		if ($valid !== false && $element['type'] == 'subform')
+		{
+			$field   = $this->loadField($element);
+			$subForm = $field->loadSubForm();
+
+			if ($field->multiple)
+			{
+				foreach ($value as $key => $val)
+				{
+					$val = (array) $val;
+
+					$valid = $subForm->validate($val);
+
+					if ($valid === false)
+					{
+						break;
+					}
+				}
+			}
+			else
+			{
+				$valid = $subForm->validate($value);
+			}
+
+			if ($valid === false)
+			{
+				$errors = $subForm->getErrors();
+
+				foreach ($errors as $error)
+				{
+					return $error;
+				}
+			}
+		}
+
 		// Check if the field is valid.
 		if ($valid === false)
 		{

diff --git a/libraries/src/Version.php b/libraries/src/Version.php
@@ -49,7 +49,7 @@ final class Version
 	 * @var    integer
 	 * @since  3.8.0
 	 */
-	const PATCH_VERSION = 9;
+	const PATCH_VERSION = 10;
 
 	/**
 	 * Extra release version info.
@@ -78,7 +78,7 @@ final class Version
 	 * @since  3.5
 	 * @deprecated  4.0  Use separated version constants instead
 	 */
-	const DEV_LEVEL = '9-dev';
+	const DEV_LEVEL = '10-dev';
 
 	/**
 	 * Development status.
@@ -111,15 +111,15 @@ final class Version
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELDATE = '3-July-2019';
+	const RELDATE = '8-July-2019';
 
 	/**
 	 * Release time.
 	 *
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELTIME = '19:13';
+	const RELTIME = '16:58';
 
 	/**
 	 * Release timezone.