From 48c589f5fd11732464a5fd8809ceb7dad1cfd84a Mon Sep 17 00:00:00 2001
From: nathan <nathangray.bsc+github@gmail.com>
Date: Fri, 24 Mar 2023 13:15:23 -0600
Subject: [PATCH] Calendar: Fix missing owner resource icons on initial load

---
 .../inc/class.calendar_owner_etemplate_widget.inc.php  | 10 +++++-----
 calendar/inc/class.calendar_ui.inc.php                 |  2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/calendar/inc/class.calendar_owner_etemplate_widget.inc.php b/calendar/inc/class.calendar_owner_etemplate_widget.inc.php
index 8e3bc74d5c..b37b7103ee 100644
--- a/calendar/inc/class.calendar_owner_etemplate_widget.inc.php
+++ b/calendar/inc/class.calendar_owner_etemplate_widget.inc.php
@@ -322,14 +322,14 @@ class calendar_owner_etemplate_widget extends Etemplate\Widget\Taglist
 			case 'c':
 			case '':
 				// check if link-search already returned either icon or (l|f)name and only if not, query contact again
-				if (!(isset($value['icon']) || isset($value['lname']) && isset($value['fname'])) &&
-					($contact = $contacts_obj->read($type === '' ? 'account:'.$id : $id, true)))
+				if(!(isset($value['icon']) || isset($value['lname']) && isset($value['fname'])) &&
+					($contact = $contacts_obj->read($type === '' ? 'account:' . $id : $data['res_id'], true)))
 				{
-					if (Api\Contacts::hasPhoto($contact))
+					if(Api\Contacts::hasPhoto($contact))
 					{
 						$value['icon'] = Api\Framework::link('/api/avatar.php', array(
 							'contact_id' => $contact['id'],
-							'etag' => $contact['etag'] ? $contact['etag'] : 1
+							'etag'       => $contact['etag'] ? $contact['etag'] : 1
 						));
 					}
 					else
@@ -340,7 +340,7 @@ class calendar_owner_etemplate_widget extends Etemplate\Widget\Taglist
 				}
 				if($id < 0)
 				{
-					$value['resources'] = array_map('strval',$GLOBALS['egw']->accounts->members($id, true));
+					$value['resources'] = array_map('strval', $GLOBALS['egw']->accounts->members($id, true));
 				}
 				break;
 			default :
diff --git a/calendar/inc/class.calendar_ui.inc.php b/calendar/inc/class.calendar_ui.inc.php
index 82ac0da521..47dd97da26 100644
--- a/calendar/inc/class.calendar_ui.inc.php
+++ b/calendar/inc/class.calendar_ui.inc.php
@@ -16,6 +16,8 @@ use EGroupware\Api\Egw;
 use EGroupware\Api\Etemplate;
 use EGroupware\Api\Framework;
 
+require_once("class.calendar_owner_etemplate_widget.inc.php");
+
 /**
  * Shared base-class of all calendar UserInterface classes
  *