From aeaf2b5a9e6988156e85a56b053d2de2c304a27d Mon Sep 17 00:00:00 2001 From: Harald Leithner Date: Wed, 15 Apr 2020 16:11:58 +0200 Subject: [PATCH] Release Candidate for Joomla! 3.9.17 --- administrator/language/en-GB/en-GB.xml | 2 +- administrator/language/en-GB/install.xml | 2 +- administrator/manifests/files/joomla.xml | 4 ++-- administrator/manifests/packages/pkg_en-GB.xml | 2 +- installation/language/en-GB/en-GB.xml | 2 +- language/en-GB/en-GB.xml | 2 +- language/en-GB/install.xml | 2 +- libraries/src/MVC/Model/AdminModel.php | 2 +- libraries/src/Version.php | 10 +++++----- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/administrator/language/en-GB/en-GB.xml b/administrator/language/en-GB/en-GB.xml index 50f1c09cbf05b..a8e23557088f5 100644 --- a/administrator/language/en-GB/en-GB.xml +++ b/administrator/language/en-GB/en-GB.xml @@ -2,7 +2,7 @@ English (en-GB) 3.9.17 - March 2020 + April 2020 Joomla! Project admin@joomla.org www.joomla.org diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml index f8709754ca835..7e03780a73fc5 100644 --- a/administrator/language/en-GB/install.xml +++ b/administrator/language/en-GB/install.xml @@ -3,7 +3,7 @@ English (en-GB) en-GB 3.9.17 - March 2020 + April 2020 Joomla! Project admin@joomla.org www.joomla.org diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index f9508967318e3..f9b7b72fd752b 100644 --- a/administrator/manifests/files/joomla.xml +++ b/administrator/manifests/files/joomla.xml @@ -6,8 +6,8 @@ www.joomla.org (C) 2005 - 2020 Open Source Matters. All rights reserved GNU General Public License version 2 or later; see LICENSE.txt - 3.9.17-dev - March 2020 + 3.9.17-rc + April 2020 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 d9b6eb638d0a8..3a5dc9570528b 100644 --- a/administrator/manifests/packages/pkg_en-GB.xml +++ b/administrator/manifests/packages/pkg_en-GB.xml @@ -3,7 +3,7 @@ English (en-GB) Language Pack en-GB 3.9.17.1 - March 2020 + April 2020 Joomla! Project admin@joomla.org www.joomla.org diff --git a/installation/language/en-GB/en-GB.xml b/installation/language/en-GB/en-GB.xml index d6a03a3db3871..7c45df4c7af0e 100644 --- a/installation/language/en-GB/en-GB.xml +++ b/installation/language/en-GB/en-GB.xml @@ -4,7 +4,7 @@ client="installation"> English (United Kingdom) 3.9.17 - March 2020 + April 2020 Joomla! Project Copyright (C) 2005 - 2020 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/language/en-GB/en-GB.xml b/language/en-GB/en-GB.xml index 035dd3cc0473f..329e9d9ec4c6a 100644 --- a/language/en-GB/en-GB.xml +++ b/language/en-GB/en-GB.xml @@ -2,7 +2,7 @@ English (en-GB) 3.9.17 - March 2020 + April 2020 Joomla! Project admin@joomla.org www.joomla.org diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml index 1836ecb1a8ebe..a422c33e0edf8 100644 --- a/language/en-GB/install.xml +++ b/language/en-GB/install.xml @@ -3,7 +3,7 @@ English (en-GB) en-GB 3.9.17 - March 2020 + April 2020 Joomla! Project admin@joomla.org www.joomla.org diff --git a/libraries/src/MVC/Model/AdminModel.php b/libraries/src/MVC/Model/AdminModel.php index a9029b30fbf94..12510a3fdc453 100644 --- a/libraries/src/MVC/Model/AdminModel.php +++ b/libraries/src/MVC/Model/AdminModel.php @@ -1632,7 +1632,7 @@ public function editAssociations($data) * @return boolean True if successful, false otherwise. * * @throws \Exception - * @since __DEPLOY_VERSION__ + * @since 3.9.17 */ protected function redirectToAssociations($data) { diff --git a/libraries/src/Version.php b/libraries/src/Version.php index c34131ec45b28..84b097cf6d603 100644 --- a/libraries/src/Version.php +++ b/libraries/src/Version.php @@ -60,7 +60,7 @@ final class Version * @var string * @since 3.8.0 */ - const EXTRA_VERSION = 'dev'; + const EXTRA_VERSION = 'rc'; /** * Release version. @@ -78,7 +78,7 @@ final class Version * @since 3.5 * @deprecated 4.0 Use separated version constants instead */ - const DEV_LEVEL = '17-dev'; + const DEV_LEVEL = '17-rc'; /** * Development status. @@ -86,7 +86,7 @@ final class Version * @var string * @since 3.5 */ - const DEV_STATUS = 'Development'; + const DEV_STATUS = 'Release Candidate'; /** * Build number. @@ -111,7 +111,7 @@ final class Version * @var string * @since 3.5 */ - const RELDATE = '10-March-2020'; + const RELDATE = '15-April-2020'; /** * Release time. @@ -119,7 +119,7 @@ final class Version * @var string * @since 3.5 */ - const RELTIME = '15:28'; + const RELTIME = '15:10'; /** * Release timezone.