From dba1ad00d917f3675f14fe01f94e931889cb6b9c Mon Sep 17 00:00:00 2001
From: Len <Len-PGH@users.noreply.github.com>
Date: Tue, 4 Dec 2018 23:40:49 -0500
Subject: [PATCH] Update directory.xml (#3924)

---
 .../provision/yealink/t23g/directory.xml      | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/resources/templates/provision/yealink/t23g/directory.xml b/resources/templates/provision/yealink/t23g/directory.xml
index a05b029e18..81f4fcec97 100644
--- a/resources/templates/provision/yealink/t23g/directory.xml
+++ b/resources/templates/provision/yealink/t23g/directory.xml
@@ -3,6 +3,11 @@
 {if $smarty.get.contacts == "users" && $row.category == "users"}
 	<DirectoryEntry>
 	{if $row.contact_name_given != ""}
+		{if $row.contact_organization != ""}
+			<Name>{$row.contact_organization} {$row.contact_name_given} {$row.contact_name_family}</Name>
+		{else}
+			<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+		{/if}
 		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
 	{else}
 		<Name>{$row.effective_caller_id_name}</Name>
@@ -19,7 +24,11 @@
 {elseif $smarty.get.contacts == "groups" && $row.category == "groups"}
 	<DirectoryEntry>
 	{if $row.contact_name_given != ""}
-		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+		{if $row.contact_organization != ""}
+			<Name>{$row.contact_organization} {$row.contact_name_given} {$row.contact_name_family}</Name>
+		{else}
+			<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+		{/if}
 	{else}
 		<Name>{$row.effective_caller_id_name}</Name>
 	{/if}
@@ -48,7 +57,11 @@
 {elseif $smarty.get.contacts == "all"}
 	<DirectoryEntry>
 	{if $row.contact_name_given != ""}
-		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+		{if $row.contact_organization != ""}
+			<Name>{$row.contact_organization} {$row.contact_name_given} {$row.contact_name_family}</Name>
+		{else}
+			<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+		{/if}
 	{else}
 		<Name>{$row.effective_caller_id_name}</Name>
 	{/if}
@@ -71,4 +84,4 @@
 	</DirectoryEntry>
 {/if}
 {/foreach}
-</YealinkIPPhoneDirectory>
\ No newline at end of file
+</YealinkIPPhoneDirectory>