File tree Expand file tree Collapse file tree 7 files changed +51
-42
lines changed
administrator/manifests/files
plugins/system/webauthn/src Expand file tree Collapse file tree 7 files changed +51
-42
lines changed Original file line number Diff line number Diff line change 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.4.0-beta4-dev </version >
9+ <version >5.4.0-rc1 </version >
1010 <creationDate >2025-09</creationDate >
1111 <description >FILES_JOOMLA_XML_DESCRIPTION</description >
1212
Original file line number Diff line number Diff line change 3737 "type" : " vcs" ,
3838 "url" : " https://github.com/joomla-backports/portable-utf8.git" ,
3939 "no-api" : true
40+ },
41+ {
42+ "type" : " vcs" ,
43+ "url" : " https://github.com/joomla-framework/security-filter.git"
4044 }
4145 ],
4246 "autoload" : {
6165 "joomla/database" : " ^3.4" ,
6266 "joomla/di" : " ^3.1.1" ,
6367 "joomla/event" : " ^3.0.2" ,
64- "joomla/filter" : " ^3.0.4 " ,
68+ "joomla/filter" : " dev-3.x-tabsinattributes as 3.0.5 " ,
6569 "joomla/filesystem" : " ^3.2.0" ,
6670 "joomla/http" : " ^3.1.2" ,
6771 "joomla/input" : " ~3.0" ,
Original file line number Diff line number Diff line change 11<?xml version =" 1.0" encoding =" UTF-8" ?>
22<metafile client =" site" >
33 <name >English (en-GB)</name >
4- <version >5.3.4 </version >
4+ <version >5.4.0 </version >
55 <creationDate >2025-09</creationDate >
66 <author >Joomla! Project</author >
77 <
authorEmail >
[email protected] </
authorEmail >
Original file line number Diff line number Diff 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,15 +90,15 @@ 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.
9797 *
9898 * @var string
9999 * @since 3.5
100100 */
101- public const RELTIME = '18:01 ' ;
101+ public const RELTIME = '16:15 ' ;
102102
103103 /**
104104 * Release timezone.
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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 );
You can’t perform that action at this time.
0 commit comments