diff --git a/administrator/components/com_admin/postinstall/behindproxy.php b/administrator/components/com_admin/postinstall/behindproxy.php index 29a45a0eec5..cd1ab838c99 100644 --- a/administrator/components/com_admin/postinstall/behindproxy.php +++ b/administrator/components/com_admin/postinstall/behindproxy.php @@ -18,7 +18,7 @@ use Joomla\Utilities\ArrayHelper; * * @return boolean * - * @since __DEPLOY_VERSION__ + * @since 3.9.26 */ function admin_postinstall_behindproxy_condition() { @@ -48,7 +48,7 @@ function admin_postinstall_behindproxy_condition() * * @return void * - * @since __DEPLOY_VERSION__ + * @since 3.9.26 */ function behindproxy_postinstall_action() { diff --git a/administrator/language/en-GB/en-GB.xml b/administrator/language/en-GB/en-GB.xml index 0c67ff3c1d1..246100412e2 100644 --- a/administrator/language/en-GB/en-GB.xml +++ b/administrator/language/en-GB/en-GB.xml @@ -1,8 +1,8 @@ English (en-GB) - 3.9.25 - March 2021 + 3.9.26 + April 2021 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 4f57cced799..a0f23ffd3a5 100644 --- a/administrator/language/en-GB/install.xml +++ b/administrator/language/en-GB/install.xml @@ -2,8 +2,8 @@ English (en-GB) en-GB - 3.9.25 - March 2021 + 3.9.26 + April 2021 Joomla! Project admin@joomla.org www.joomla.org diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index 355c444118d..94b43e576c3 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.25 - March 2021 + 3.9.26-rc + April 2021 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 d9dc6a01594..c2b5ebb490d 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 - 3.9.25.1 - March 2021 + 3.9.26.1 + April 2021 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 672e5a8e586..ca09cd77a0e 100644 --- a/installation/language/en-GB/en-GB.xml +++ b/installation/language/en-GB/en-GB.xml @@ -3,8 +3,8 @@ version="3.8" client="installation"> English (United Kingdom) - 3.9.25 - March 2021 + 3.9.26 + April 2021 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 3e3345f0514..83857722b4b 100644 --- a/language/en-GB/en-GB.xml +++ b/language/en-GB/en-GB.xml @@ -1,8 +1,8 @@ English (en-GB) - 3.9.25 - March 2021 + 3.9.26 + April 2021 Joomla! Project admin@joomla.org www.joomla.org diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml index 82a27b682a6..96756eb6cc1 100644 --- a/language/en-GB/install.xml +++ b/language/en-GB/install.xml @@ -2,8 +2,8 @@ English (en-GB) en-GB - 3.9.25 - March 2021 + 3.9.26 + April 2021 Joomla! Project admin@joomla.org www.joomla.org diff --git a/libraries/src/Installer/Installer.php b/libraries/src/Installer/Installer.php index a39aef87f03..93a5869f1f9 100644 --- a/libraries/src/Installer/Installer.php +++ b/libraries/src/Installer/Installer.php @@ -120,7 +120,7 @@ class Installer extends \JAdapter * Backup extra_query during update_sites rebuild * * @var string - * @since __DEPLOY_VERSION__ + * @since 3.9.26 */ public $extraQuery = ''; diff --git a/libraries/src/Menu/AbstractMenu.php b/libraries/src/Menu/AbstractMenu.php index 4f1e5183cab..7eb5a1b40eb 100644 --- a/libraries/src/Menu/AbstractMenu.php +++ b/libraries/src/Menu/AbstractMenu.php @@ -61,7 +61,7 @@ class AbstractMenu * User object to check access levels for * * @var User - * @since __DEPLOY_VERSION__ + * @since 3.9.26 */ protected $storedUser; @@ -152,7 +152,7 @@ class AbstractMenu * * @return null * - * @since __DEPLOY_VERSION__ + * @since 3.9.26 */ public function setUser($user) { @@ -396,7 +396,7 @@ class AbstractMenu * * @return User * - * @since __DEPLOY_VERSION__ + * @since 3.9.26 */ protected function getUser() { @@ -417,7 +417,7 @@ class AbstractMenu * * @return User|null * - * @since __DEPLOY_VERSION__ + * @since 3.9.26 */ public function __get($propName) { diff --git a/libraries/src/Version.php b/libraries/src/Version.php index 9b2e949a3b6..de99605cc76 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 = '26-dev'; + const DEV_LEVEL = '26-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 = '2-March-2021'; + const RELDATE = '7-April-2021'; /** * Release time. @@ -119,7 +119,7 @@ final class Version * @var string * @since 3.5 */ - const RELTIME = '15:07'; + const RELTIME = '22:45'; /** * Release timezone. diff --git a/tests/unit/suites/libraries/cms/form/rule/FilePathRuleTest.php b/tests/unit/suites/libraries/cms/form/rule/FilePathRuleTest.php index 3f45e53b025..da68cd9c25c 100644 --- a/tests/unit/suites/libraries/cms/form/rule/FilePathRuleTest.php +++ b/tests/unit/suites/libraries/cms/form/rule/FilePathRuleTest.php @@ -15,7 +15,7 @@ use Joomla\CMS\Form\Rule\FilePathRule; * * @package Joomla.UnitTest * @subpackage Form - * @since __DEPLOY_VERSION__ + * @since 3.9.26 */ class FilePathRuleTest extends TestCase { @@ -24,7 +24,7 @@ class FilePathRuleTest extends TestCase * * @return array * - * @since __DEPLOY_VERSION__ + * @since 3.9.26 */ public function dataTestPaths() { @@ -77,7 +77,7 @@ class FilePathRuleTest extends TestCase * * @return void * - * @since __DEPLOY_VERSION__ + * @since 3.9.26 * @dataProvider dataTestPaths */ public function testRule($expected, $element, $value)