Merge remote-tracking branch 'joomla/staging' into user_profile_form_…

…prepared_twice
joomla · Oct 5, 2017 · 3a1b635 · 3a1b635
2 parents bf6ac31 + 8a1b4f2
commit 3a1b635
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 22 deletions.
diff --git a/administrator/language/en-GB/en-GB.xml b/administrator/language/en-GB/en-GB.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile version="3.7" client="administrator">
 	<name>English (en-GB)</name>
-	<version>3.8.1</version>
-	<creationDate>September 2017</creationDate>
+	<version>3.8.2</version>
+	<creationDate>October 2017</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml
@@ -2,8 +2,8 @@
 <extension version="3.7" client="administrator" type="language" method="upgrade">
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
-	<version>3.8.1</version>
-	<creationDate>September 2017</creationDate>
+	<version>3.8.2</version>
+	<creationDate>October 2017</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
@@ -6,8 +6,8 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<copyright>(C) 2005 - 2017 Open Source Matters. All rights reserved</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>3.8.1-rc2-dev</version>
-	<creationDate>September 2017</creationDate>
+	<version>3.8.2-dev</version>
+	<creationDate>October 2017</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
@@ -2,8 +2,8 @@
 <extension type="package" version="3.7" method="upgrade">
 	<name>English (en-GB) Language Pack</name>
 	<packagename>en-GB</packagename>
-	<version>3.8.1.1</version>
-	<creationDate>September 2017</creationDate>
+	<version>3.8.2.1</version>
+	<creationDate>October 2017</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/installation/language/en-GB/en-GB.xml b/installation/language/en-GB/en-GB.xml
@@ -3,8 +3,8 @@
 	version="3.7"
 	client="installation">
 	<name>English (United Kingdom)</name>
-	<version>3.8.1</version>
-	<creationDate>September 2017</creationDate>
+	<version>3.8.2</version>
+	<creationDate>October 2017</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

diff --git a/language/en-GB/en-GB.xml b/language/en-GB/en-GB.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile version="3.7" client="site">
 	<name>English (en-GB)</name>
-	<version>3.8.1</version>
-	<creationDate>September 2017</creationDate>
+	<version>3.8.2</version>
+	<creationDate>October 2017</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml
@@ -2,8 +2,8 @@
 <extension version="3.7" client="site" type="language" method="upgrade">
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
-	<version>3.8.1</version>
-	<creationDate>September 2017</creationDate>
+	<version>3.8.2</version>
+	<creationDate>October 2017</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/libraries/src/Form/FormHelper.php b/libraries/src/Form/FormHelper.php
@@ -449,7 +449,20 @@ public static function parseShowOnConditions($showOn, $formControl = null, $grou
 
 		if ($group)
 		{
-			$formPath .= $formPath ? '[' . $group . ']' : $group;
+			$groups = explode('.', $group);
+
+			// An empty formControl leads to invalid shown property
+			// Use the 1st part of the group instead to avoid.
+			if (empty($formPath) && isset($groups[0]))
+			{
+				$formPath = $groups[0];
+				array_shift($groups);
+			}
+
+			foreach ($groups as $group)
+			{
+				$formPath .= '[' . $group . ']';
+			}
 		}
 
 		$showOnData  = array();

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 = 1;
+	const PATCH_VERSION = 2;
 
 	/**
 	 * Extra release version info.
@@ -60,7 +60,7 @@ final class Version
 	 * @var    string
 	 * @since  3.8.0
 	 */
-	const EXTRA_VERSION = 'rc2-dev';
+	const EXTRA_VERSION = 'dev';
 
 	/**
 	 * Release version.
@@ -78,7 +78,7 @@ final class Version
 	 * @since  3.5
 	 * @deprecated  4.0  Use separated version constants instead
 	 */
-	const DEV_LEVEL = '1-rc2-dev';
+	const DEV_LEVEL = '2-dev';
 
 	/**
 	 * Development status.
@@ -111,15 +111,15 @@ final class Version
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELDATE = '30-September-2017';
+	const RELDATE = '4-October-2017';
 
 	/**
 	 * Release time.
 	 *
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELTIME = '16:00';
+	const RELTIME = '14:00';
 
 	/**
 	 * Release timezone.

diff --git a/media/system/js/core-uncompressed.js b/media/system/js/core-uncompressed.js
@@ -676,7 +676,7 @@ Joomla.editors.instances = Joomla.editors.instances || {
 	 * @deprecated 4.0  Use Joomla.listItemTask() instead
 	 */
 	window.listItemTask = function ( id, task ) {
-		Joomla.listItemTask( id, task );
+		return Joomla.listItemTask( id, task );
 	};
 
 	/**

diff --git a/media/system/js/core.js b/media/system/js/core.js