Skip to content

Commit 65523b4

Browse files
committed
Joomla! 6.0.0 Release Candidate 1
1 parent d2d5164 commit 65523b4

File tree

7 files changed

+51
-41
lines changed

7 files changed

+51
-41
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>6.0.0-beta4-dev</version>
9+
<version>6.0.0-rc1</version>
1010
<creationDate>2025-09</creationDate>
1111
<description>FILES_JOOMLA_XML_DESCRIPTION</description>
1212

composer.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
"type": "vcs",
3333
"url": "https://github.com/joomla-backports/php-tuf.git",
3434
"no-api": true
35+
},
36+
{
37+
"type": "vcs",
38+
"url": "https://github.com/joomla-framework/security-filter.git"
3539
}
3640
],
3741
"autoload": {
@@ -56,7 +60,7 @@
5660
"joomla/database": "^4.0",
5761
"joomla/di": "^4.0",
5862
"joomla/event": "^4.0",
59-
"joomla/filter": "^4.0",
63+
"joomla/filter": "dev-4.x-tabsinattributes as 4.0.1",
6064
"joomla/filesystem": "^4.0",
6165
"joomla/http": "^4.0",
6266
"joomla/input": "^4.0",

composer.lock

Lines changed: 33 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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 = 'beta4-dev';
69+
public const EXTRA_VERSION = 'rc1';
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,7 +90,7 @@ final class Version
9090
* @var string
9191
* @since 3.5
9292
*/
93-
public const RELDATE = '16-September-2025';
93+
public const RELDATE = '30-September-2025';
9494

9595
/**
9696
* Release time.
@@ -99,7 +99,7 @@ final class Version
9999
* @since 3.5
100100
*/
101101

102-
public const RELTIME = '16:31';
102+
public const RELTIME = '16:15';
103103

104104
/**
105105
* Release timezone.

plugins/fields/note/src/Extension/Note.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ final class Note extends FieldsPlugin implements SubscriberInterface
3232
*
3333
* @return void
3434
*
35-
* @since __DEPLOY_VERSION__
35+
* @since 6.0.0
3636
*/
3737
public function prepareForm(PrepareFormEvent $event)
3838
{

plugins/system/webauthn/src/Authentication.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -430,10 +430,10 @@ private function getUserEntity(User $user): PublicKeyCredentialUserEntity
430430
$repository = $this->credentialsRepository;
431431

432432
return new PublicKeyCredentialUserEntity(
433-
$user->username,
434-
$repository->getHandleFromUserId($user->id),
435-
$user->name,
436-
$this->getAvatar($user, 64)
433+
(string) $user->username,
434+
(string) $repository->getHandleFromUserId($user->id),
435+
(string) $user->name,
436+
$user->username ? $this->getAvatar($user, 64) : ''
437437
);
438438
}
439439

plugins/system/webauthn/src/PluginTraits/AjaxHandlerChallenge.php

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -76,27 +76,11 @@ public function onAjaxWebauthnChallenge(AjaxChallenge $event): void
7676

7777
// Is the username valid?
7878
try {
79-
$userId = UserHelper::getUserId($username);
79+
$userId = UserHelper::getUserId($username) ?: 0;
80+
$myUser = $userId ? Factory::getContainer()->get(UserFactoryInterface::class)->loadUserById($userId) : new User();
8081
} catch (\Exception $e) {
81-
$userId = 0;
82-
}
83-
84-
if ($userId <= 0) {
85-
$event->addResult(false);
86-
87-
return;
88-
}
89-
90-
try {
91-
$myUser = Factory::getContainer()->get(UserFactoryInterface::class)->loadUserById($userId);
92-
} catch (\Exception) {
9382
$myUser = new User();
94-
}
95-
96-
if ($myUser->id != $userId || $myUser->guest) {
97-
$event->addResult(false);
98-
99-
return;
83+
$userId = 0;
10084
}
10185

10286
$publicKeyCredentialRequestOptions = $this->authenticationHelper->getPubkeyRequestOptions($myUser);

0 commit comments

Comments
 (0)