From b7ea6e4b50cfd0c1d71f060ee275aa25548c1c21 Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Fri, 17 Jul 2026 12:39:09 +0100 Subject: [PATCH 1/2] use nullsafe operator when getting user id --- src/Fields/Blueprint.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Fields/Blueprint.php b/src/Fields/Blueprint.php index 33619eb35f3..2503a80c277 100644 --- a/src/Fields/Blueprint.php +++ b/src/Fields/Blueprint.php @@ -457,7 +457,7 @@ public function toPublishArray() 'fqh' => $this->fullyQualifiedHandle(), 'token' => encrypt([ 'fqh' => $this->fullyQualifiedHandle(), - 'user_id' => User::current()->id(), + 'user_id' => User::current()?->id(), ]), ]; } From 8d694380aa2070ce347e62b84aa18583394ba82d Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Fri, 17 Jul 2026 12:39:32 +0100 Subject: [PATCH 2/2] only touch fieldFocus object when user is logged in --- resources/js/components/ui/Publish/Container.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/js/components/ui/Publish/Container.vue b/resources/js/components/ui/Publish/Container.vue index 98698554cf6..65a6785d899 100644 --- a/resources/js/components/ui/Publish/Container.vue +++ b/resources/js/components/ui/Publish/Container.vue @@ -260,12 +260,12 @@ const fieldLocks = computed(() => { function focusField(handle, user = Statamic.user) { if (handle.includes('.')) throw new Error('focusField only supports top-level fields.'); - fieldFocus.value[user.id] = { handle, user }; + if (user) fieldFocus.value[user.id] = { handle, user }; } function blurField(handle, user = Statamic.user) { if (handle.includes('.')) throw new Error('blurField only supports top-level fields.'); - if (fieldFocus.value[user.id]?.handle === handle) { + if (user && fieldFocus.value[user.id]?.handle === handle) { delete fieldFocus.value[user.id]; } }