From 5897df8ee39056fbd37624eeeeff1b81e24d84ef Mon Sep 17 00:00:00 2001 From: Roland Dalmulder Date: Wed, 15 Feb 2023 10:19:14 +0100 Subject: [PATCH] Joomla! 4.2.8 Stable --- administrator/language/en-GB/install.xml | 4 ++-- administrator/language/en-GB/langmetadata.xml | 4 ++-- administrator/manifests/files/joomla.xml | 4 ++-- administrator/manifests/packages/pkg_en-GB.xml | 4 ++-- api/language/en-GB/install.xml | 4 ++-- api/language/en-GB/langmetadata.xml | 4 ++-- installation/language/en-GB/langmetadata.xml | 4 ++-- language/en-GB/install.xml | 4 ++-- language/en-GB/langmetadata.xml | 4 ++-- libraries/src/Router/ApiRouter.php | 7 +++++++ libraries/src/Version.php | 4 ++-- 11 files changed, 27 insertions(+), 20 deletions(-) diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml index 3d3ca4e3903b1..a85b2f71eca88 100644 --- a/administrator/language/en-GB/install.xml +++ b/administrator/language/en-GB/install.xml @@ -2,8 +2,8 @@ English (en-GB) en-GB - 4.2.7 - 2023-01 + 4.2.8 + 2023-02 Joomla! Project admin@joomla.org www.joomla.org diff --git a/administrator/language/en-GB/langmetadata.xml b/administrator/language/en-GB/langmetadata.xml index 18cff6181cead..c426ffcaf2b91 100644 --- a/administrator/language/en-GB/langmetadata.xml +++ b/administrator/language/en-GB/langmetadata.xml @@ -1,8 +1,8 @@ English (en-GB) - 4.2.7 - 2023-01 + 4.2.8 + 2023-02 Joomla! Project admin@joomla.org www.joomla.org diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index f54bc84e05038..660e1d80d994f 100644 --- a/administrator/manifests/files/joomla.xml +++ b/administrator/manifests/files/joomla.xml @@ -6,8 +6,8 @@ www.joomla.org (C) 2019 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt - 4.2.7 - 2023-01 + 4.2.8 + 2023-02 FILES_JOOMLA_XML_DESCRIPTION administrator/components/com_admin/script.php diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml index f561473eadde3..420df7051635b 100644 --- a/administrator/manifests/packages/pkg_en-GB.xml +++ b/administrator/manifests/packages/pkg_en-GB.xml @@ -2,8 +2,8 @@ English (en-GB) Language Pack en-GB - 4.2.7.1 - 2023-01 + 4.2.8.1 + 2023-02 Joomla! Project admin@joomla.org www.joomla.org diff --git a/api/language/en-GB/install.xml b/api/language/en-GB/install.xml index d6142de59d07d..a52f33e4d1e3a 100644 --- a/api/language/en-GB/install.xml +++ b/api/language/en-GB/install.xml @@ -2,8 +2,8 @@ English (en-GB) en-GB - 4.2.7 - 2023-01 + 4.2.8 + 2023-02 Joomla! Project admin@joomla.org www.joomla.org diff --git a/api/language/en-GB/langmetadata.xml b/api/language/en-GB/langmetadata.xml index f99c11e9fdeb4..56a5047c9f16e 100644 --- a/api/language/en-GB/langmetadata.xml +++ b/api/language/en-GB/langmetadata.xml @@ -1,8 +1,8 @@ English (en-GB) - 4.2.7 - 2023-01 + 4.2.8 + 2023-02 Joomla! Project admin@joomla.org www.joomla.org diff --git a/installation/language/en-GB/langmetadata.xml b/installation/language/en-GB/langmetadata.xml index 7e5f4bb9ef4ca..8620be51157bf 100644 --- a/installation/language/en-GB/langmetadata.xml +++ b/installation/language/en-GB/langmetadata.xml @@ -1,8 +1,8 @@ English (United Kingdom) - 4.2.7 - 2023-01 + 4.2.8 + 2023-02 Joomla! Project (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml index 8ee4ae651dccd..aaa30665ec447 100644 --- a/language/en-GB/install.xml +++ b/language/en-GB/install.xml @@ -2,8 +2,8 @@ English (en-GB) en-GB - 4.2.7 - 2023-01 + 4.2.8 + 2023-02 Joomla! Project admin@joomla.org www.joomla.org diff --git a/language/en-GB/langmetadata.xml b/language/en-GB/langmetadata.xml index ec2869661def0..665c9b8a0b4d2 100644 --- a/language/en-GB/langmetadata.xml +++ b/language/en-GB/langmetadata.xml @@ -1,8 +1,8 @@ English (en-GB) - 4.2.7 - 2023-01 + 4.2.8 + 2023-02 Joomla! Project admin@joomla.org www.joomla.org diff --git a/libraries/src/Router/ApiRouter.php b/libraries/src/Router/ApiRouter.php index a9e85bd274b24..bb1e5d36ae409 100644 --- a/libraries/src/Router/ApiRouter.php +++ b/libraries/src/Router/ApiRouter.php @@ -101,6 +101,11 @@ public function parseApiRoute($method = 'GET') $query = Uri::getInstance()->getQuery(true); + // Remove the public key as it is only supported coming from the route definition + if (array_key_exists('public', $query)) { + unset($query['public']); + } + // Iterate through all of the known routes looking for a match. foreach ($this->routes as $route) { if (\in_array($method, $route->getMethods())) { @@ -113,6 +118,8 @@ public function parseApiRoute($method = 'GET') } $controller = preg_split("/[.]+/", $route->getController()); + + /** @deprecated 4.3 Query parameters will not be merged into route variables from 5.0 */ $vars = array_merge($vars, $query); return [ diff --git a/libraries/src/Version.php b/libraries/src/Version.php index c14fd8c96bc08..b2e9cc7251c19 100644 --- a/libraries/src/Version.php +++ b/libraries/src/Version.php @@ -55,7 +55,7 @@ final class Version * @var integer * @since 3.8.0 */ - public const PATCH_VERSION = 7; + public const PATCH_VERSION = 8; /** * Extra release version info. @@ -90,7 +90,7 @@ final class Version * @var string * @since 3.5 */ - public const RELDATE = '31-January-2023'; + public const RELDATE = '16-February-2023'; /** * Release time.