Skip to content

Commit d34a3ec

Browse files
committed
Prepare 3.9.9 release
1 parent fefffc9 commit d34a3ec

File tree

3 files changed

+41
-6
lines changed

3 files changed

+41
-6
lines changed

administrator/manifests/files/joomla.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<authorUrl>www.joomla.org</authorUrl>
77
<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
9-
<version>3.9.9-dev</version>
9+
<version>3.9.9</version>
1010
<creationDate>July 2019</creationDate>
1111
<description>FILES_JOOMLA_XML_DESCRIPTION</description>
1212

libraries/src/Form/Form.php

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2145,6 +2145,41 @@ protected function validateField(\SimpleXMLElement $element, $group = null, $val
21452145
}
21462146
}
21472147

2148+
if ($valid !== false && $element['type'] == 'subform')
2149+
{
2150+
$field = $this->loadField($element);
2151+
$subForm = $field->loadSubForm();
2152+
2153+
if ($field->multiple)
2154+
{
2155+
foreach ($value as $key => $val)
2156+
{
2157+
$val = (array) $val;
2158+
2159+
$valid = $subForm->validate($val);
2160+
2161+
if ($valid === false)
2162+
{
2163+
break;
2164+
}
2165+
}
2166+
}
2167+
else
2168+
{
2169+
$valid = $subForm->validate($value);
2170+
}
2171+
2172+
if ($valid === false)
2173+
{
2174+
$errors = $subForm->getErrors();
2175+
2176+
foreach ($errors as $error)
2177+
{
2178+
return $error;
2179+
}
2180+
}
2181+
}
2182+
21482183
// Check if the field is valid.
21492184
if ($valid === false)
21502185
{

libraries/src/Version.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ final class Version
6060
* @var string
6161
* @since 3.8.0
6262
*/
63-
const EXTRA_VERSION = 'dev';
63+
const EXTRA_VERSION = '';
6464

6565
/**
6666
* Release version.
@@ -78,15 +78,15 @@ final class Version
7878
* @since 3.5
7979
* @deprecated 4.0 Use separated version constants instead
8080
*/
81-
const DEV_LEVEL = '9-dev';
81+
const DEV_LEVEL = '9';
8282

8383
/**
8484
* Development status.
8585
*
8686
* @var string
8787
* @since 3.5
8888
*/
89-
const DEV_STATUS = 'Development';
89+
const DEV_STATUS = 'Stable';
9090

9191
/**
9292
* Build number.
@@ -111,15 +111,15 @@ final class Version
111111
* @var string
112112
* @since 3.5
113113
*/
114-
const RELDATE = '3-July-2019';
114+
const RELDATE = '8-July-2019';
115115

116116
/**
117117
* Release time.
118118
*
119119
* @var string
120120
* @since 3.5
121121
*/
122-
const RELTIME = '19:13';
122+
const RELTIME = '15:00';
123123

124124
/**
125125
* Release timezone.

0 commit comments

Comments
 (0)