Merge branch '4.1-dev' into patch-4

joomla · May 13, 2022 · 347a871 · 347a871
2 parents 462bbf4 + ba23188
commit 347a871
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 59 deletions.
diff --git a/administrator/components/com_contact/src/Extension/ContactComponent.php b/administrator/components/com_contact/src/Extension/ContactComponent.php
@@ -64,7 +64,7 @@ class ContactComponent extends MVCComponent implements
 	public function boot(ContainerInterface $container)
 	{
 		$this->getRegistry()->register('contactadministrator', new AdministratorService);
-		$this->getRegistry()->register('contacticon', new Icon($container->get(SiteApplication::class)));
+		$this->getRegistry()->register('contacticon', new Icon);
 	}
 
 	/**

diff --git a/administrator/components/com_contact/src/Service/HTML/Icon.php b/administrator/components/com_contact/src/Service/HTML/Icon.php
@@ -28,27 +28,6 @@
  */
 class Icon
 {
-	/**
-	 * The application
-	 *
-	 * @var    CMSApplication
-	 *
-	 * @since  4.0.0
-	 */
-	private $application;
-
-	/**
-	 * Service constructor
-	 *
-	 * @param   CMSApplication  $application  The application
-	 *
-	 * @since   4.0.0
-	 */
-	public function __construct(CMSApplication $application)
-	{
-		$this->application = $application;
-	}
-
 	/**
 	 * Method to generate a link to the create item page for the given category
 	 *

diff --git a/administrator/components/com_content/src/Extension/ContentComponent.php b/administrator/components/com_content/src/Extension/ContentComponent.php
@@ -115,7 +115,7 @@ class ContentComponent extends MVCComponent implements
 	public function boot(ContainerInterface $container)
 	{
 		$this->getRegistry()->register('contentadministrator', new AdministratorService);
-		$this->getRegistry()->register('contenticon', new Icon($container->get(SiteApplication::class)));
+		$this->getRegistry()->register('contenticon', new Icon);
 
 		// The layout joomla.content.icons does need a general icon service
 		$this->getRegistry()->register('icon', $this->getRegistry()->getService('contenticon'));

diff --git a/administrator/components/com_content/src/Service/HTML/Icon.php b/administrator/components/com_content/src/Service/HTML/Icon.php
@@ -29,27 +29,6 @@
  */
 class Icon
 {
-	/**
-	 * The application
-	 *
-	 * @var    CMSApplication
-	 *
-	 * @since  4.0.0
-	 */
-	private $application;
-
-	/**
-	 * Service constructor
-	 *
-	 * @param   CMSApplication  $application  The application
-	 *
-	 * @since   4.0.0
-	 */
-	public function __construct(CMSApplication $application)
-	{
-		$this->application = $application;
-	}
-
 	/**
 	 * Method to generate a link to the create item page for the given category
 	 *
@@ -115,13 +94,13 @@ public function edit($article, $params, $attribs = array(), $legacy = false)
 		// Ignore if in a popup window.
 		if ($params && $params->get('popup'))
 		{
-			return;
+			return '';
 		}
 
 		// Ignore if the state is negative (trashed).
 		if (!in_array($article->state, [Workflow::CONDITION_UNPUBLISHED, Workflow::CONDITION_PUBLISHED]))
 		{
-			return;
+			return '';
 		}
 
 		// Show checked_out icon if the article is checked out by a different user

diff --git 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.1.3</version>
+	<version>4.1.4</version>
 	<creationDate>May 2022</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
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile client="administrator">
 	<name>English (en-GB)</name>
-	<version>4.1.3</version>
+	<version>4.1.4</version>
 	<creationDate>May 2022</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) 2019 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>4.1.3-rc2-dev</version>
+	<version>4.1.4-dev</version>
 	<creationDate>May 2022</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" method="upgrade">
 	<name>English (en-GB) Language Pack</name>
 	<packagename>en-GB</packagename>
-	<version>4.1.3.1</version>
+	<version>4.1.4.1</version>
 	<creationDate>May 2022</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
@@ -2,7 +2,7 @@
 <extension client="api" type="language" method="upgrade">
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
-	<version>4.1.3</version>
+	<version>4.1.4</version>
 	<creationDate>May 2022</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
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile client="api">
 	<name>English (en-GB)</name>
-	<version>4.1.3</version>
+	<version>4.1.4</version>
 	<creationDate>May 2022</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

diff --git a/build/media_source/system/js/draggable.es6.js b/build/media_source/system/js/draggable.es6.js
@@ -43,6 +43,7 @@ if (container) {
   // Get the form data
   formData = new FormData(form);
   formData.delete('task');
+  formData.delete('order[]');
 
   // IOS 10 BUG
   document.addEventListener('touchstart', () => {}, false);

diff --git 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.1.3</version>
+	<version>4.1.4</version>
 	<creationDate>May 2022</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
@@ -2,7 +2,7 @@
 <extension client="site" type="language" method="upgrade">
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
-	<version>4.1.3</version>
+	<version>4.1.4</version>
 	<creationDate>May 2022</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

diff --git 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.1.3</version>
+	<version>4.1.4</version>
 	<creationDate>May 2022</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

diff --git a/libraries/src/Version.php b/libraries/src/Version.php
@@ -50,7 +50,7 @@ final class Version
 	 * @var    integer
 	 * @since  3.8.0
 	 */
-	const PATCH_VERSION = 3;
+	const PATCH_VERSION = 4;
 
 	/**
 	 * Extra release version info.
@@ -61,7 +61,7 @@ final class Version
 	 * @var    string
 	 * @since  3.8.0
 	 */
-	const EXTRA_VERSION = 'rc2-dev';
+	const EXTRA_VERSION = 'dev';
 
 	/**
 	 * Development status.
@@ -85,15 +85,15 @@ final class Version
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELDATE = '1-May-2022';
+	const RELDATE = '10-May-2022';
 
 	/**
 	 * Release time.
 	 *
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELTIME = '18:22';
+	const RELTIME = '16:00';
 
 	/**
 	 * Release timezone.