From 84f491bd40e9fc2bd04ee1c18578924a6eb91c54 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sun, 30 Jul 2017 15:05:53 -0400
Subject: [PATCH] Don't fail resending email when there is no owner

---
 api/BusinessLogic/Emails/EmailTemplateParser.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/api/BusinessLogic/Emails/EmailTemplateParser.php b/api/BusinessLogic/Emails/EmailTemplateParser.php
index 4fbc3e65..e53a03b2 100644
--- a/api/BusinessLogic/Emails/EmailTemplateParser.php
+++ b/api/BusinessLogic/Emails/EmailTemplateParser.php
@@ -190,7 +190,9 @@ class EmailTemplateParser {
         $defaultStatus = $this->statusGateway->getStatusForDefaultAction(DefaultStatusForAction::NEW_TICKET, $heskSettings);
         $statusName = hesk_msgToPlain($defaultStatus->localizedNames[$language]);
         $category = hesk_msgToPlain($this->categoryGateway->getAllCategories($heskSettings)[$ticket->categoryId]->name);
-        $owner = hesk_msgToPlain($this->userGateway->getUserById($ticket->ownerId, $heskSettings)->name);
+        $owner = $this->userGateway->getUserById($ticket->ownerId, $heskSettings);
+
+        $ownerName = $owner === null ? $hesklang['unas'] : hesk_msgToPlain($owner->name);
 
         switch ($ticket->priorityId) {
             case Priority::CRITICAL:
@@ -219,7 +221,7 @@ class EmailTemplateParser {
         $msg = str_replace('%%SITE_URL%%', $heskSettings['site_url'], $msg);
         $msg = str_replace('%%CATEGORY%%', $category, $msg);
         $msg = str_replace('%%PRIORITY%%', $priority, $msg);
-        $msg = str_replace('%%OWNER%%', $owner, $msg);
+        $msg = str_replace('%%OWNER%%', $ownerName, $msg);
         $msg = str_replace('%%STATUS%%', $statusName, $msg);
         $msg = str_replace('%%EMAIL%%', implode(';',$ticket->email), $msg);
         $msg = str_replace('%%CREATED%%', $ticket->dateCreated, $msg);