From d26ff60258389d8af96743fd5ba03530f7bfe867 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 29 Apr 2021 17:34:30 +1000
Subject: [PATCH] catch all for company_user.settings

---
 app/Transformers/CompanyUserTransformer.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Transformers/CompanyUserTransformer.php b/app/Transformers/CompanyUserTransformer.php
index 2ead828ebeb4..a9a70456997a 100644
--- a/app/Transformers/CompanyUserTransformer.php
+++ b/app/Transformers/CompanyUserTransformer.php
@@ -38,10 +38,12 @@ class CompanyUserTransformer extends EntityTransformer
 
     public function transform(CompanyUser $company_user)
     {
+        $blank_obj = new \stdClass;
+
         return [
             'permissions' => $company_user->permissions ?: '',
-            'notifications' => (object) $company_user->notifications,
-            'settings' => (object) $company_user->settings,
+            'notifications' => (object) $company_user->notifications ?: $blank_obj,
+            'settings' => (object) $company_user->settings ?: $blank_obj,
             'is_owner' => (bool) $company_user->is_owner,
             'is_admin' => (bool) $company_user->is_admin,
             'is_locked' => (bool) $company_user->is_locked,