Skip to content

Commit 9fd4543

Browse files
committed
Release Joomla! 5.3 Release Candidate 2
1 parent 70703f4 commit 9fd4543

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

administrator/manifests/files/joomla.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<authorUrl>www.joomla.org</authorUrl>
77
<copyright>(C) 2019 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
9-
<version>5.3.0-rc2-dev</version>
9+
<version>5.3.0-rc2</version>
1010
<creationDate>2025-04</creationDate>
1111
<description>FILES_JOOMLA_XML_DESCRIPTION</description>
1212

libraries/src/Application/MultiFactorAuthenticationHandler.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -271,11 +271,6 @@ private function needsMultiFactorAuthenticationRedirection(): bool
271271
return false;
272272
}
273273

274-
// Do not redirect if we are already in a MFA management or captive page
275-
if ($this->isMultiFactorAuthenticationPage()) {
276-
return false;
277-
}
278-
279274
$option = strtolower($this->input->getCmd('option', ''));
280275
$task = strtolower($this->input->getCmd('task', ''));
281276

@@ -294,6 +289,13 @@ private function needsMultiFactorAuthenticationRedirection(): bool
294289
return false;
295290
}
296291

292+
// Do not redirect if we are already in a MFA management or captive page
293+
$onlyCaptive = $this->isMultiFactorAuthenticationPending() && !$isMFASetupMandatory;
294+
295+
if ($this->isMultiFactorAuthenticationPage($onlyCaptive)) {
296+
return false;
297+
}
298+
297299
return true;
298300
}
299301

libraries/src/Version.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,15 @@ final class Version
6666
* @var string
6767
* @since 3.8.0
6868
*/
69-
public const EXTRA_VERSION = 'rc2-dev';
69+
public const EXTRA_VERSION = 'rc2';
7070

7171
/**
7272
* Development status.
7373
*
7474
* @var string
7575
* @since 3.5
7676
*/
77-
public const DEV_STATUS = 'Development';
77+
public const DEV_STATUS = 'Release Candidate';
7878

7979
/**
8080
* Code name.
@@ -90,15 +90,15 @@ final class Version
9090
* @var string
9191
* @since 3.5
9292
*/
93-
public const RELDATE = '1-April-2025';
93+
public const RELDATE = '8-April-2025';
9494

9595
/**
9696
* Release time.
9797
*
9898
* @var string
9999
* @since 3.5
100100
*/
101-
public const RELTIME = '16:01';
101+
public const RELTIME = '16:30';
102102

103103
/**
104104
* Release timezone.

0 commit comments

Comments
 (0)