From 9c1d585c43ab70e2cfc7770ea553b99332876065 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Tue, 5 Mar 2024 09:22:38 +0100 Subject: [PATCH] Fix condition to return current team if user has teams --- app/Models/User.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/User.php b/app/Models/User.php index 9581d1fa5..d6389d678 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -158,7 +158,7 @@ class User extends Authenticatable implements SendsEmail public function currentTeam() { return Cache::remember('team:' . auth()->user()->id, 3600, function () { - if (is_null(data_get(session('currentTeam'), 'id'))) { + if (is_null(data_get(session('currentTeam'), 'id')) && auth()->user()->teams->count() > 0){ return auth()->user()->teams[0]; } return Team::find(session('currentTeam')->id);