From 6a64128893d8a355614baf9016d230afc8202484 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Fri, 31 Jan 2020 16:57:34 +0100
Subject: [PATCH] Fix mail tree not reading available svg icons

---
 mail/inc/class.mail_tree.inc.php                |  2 +-
 pixelegg/images/dhtmlxtree/MailFolderDrafts.svg | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 pixelegg/images/dhtmlxtree/MailFolderDrafts.svg

diff --git a/mail/inc/class.mail_tree.inc.php b/mail/inc/class.mail_tree.inc.php
index 4e226554df..9014e74bd4 100644
--- a/mail/inc/class.mail_tree.inc.php
+++ b/mail/inc/class.mail_tree.inc.php
@@ -426,7 +426,7 @@ class mail_tree
 				//User defined folders icons
 				$data[Tree::IMAGE_LEAF] =
 					$data[Tree::IMAGE_FOLDER_OPEN] =
-					$data [Tree::IMAGE_FOLDER_CLOSED] = "MailFolder".$key.".png";
+					$data [Tree::IMAGE_FOLDER_CLOSED] = basename(Api\Image::find('mail', 'dhtmlxtree/'."MailFolder".$key));
 			}
 			elseif(stripos(array2string($data['folderarray']['attributes']),'\noselect')!== false)
 			{
diff --git a/pixelegg/images/dhtmlxtree/MailFolderDrafts.svg b/pixelegg/images/dhtmlxtree/MailFolderDrafts.svg
new file mode 100644
index 0000000000..dc422729a1
--- /dev/null
+++ b/pixelegg/images/dhtmlxtree/MailFolderDrafts.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<?xml-stylesheet type="text/css" href="../less/svg.css" ?>
+<svg version="1.1" id="pixelegg_apply" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<g>
+	<g>
+		<path fill="#696969" d="M9.454,26.628h13.092v-1.062H9.454V26.628z M23.515,1.12H1.816
+			v29.76h28.368V7.57L23.515,1.12z M8.362,3.245h8.729V8.56h4.364V3.245h2.183v7.44H8.362V3.245z M26.91,28.754H5.089v-8.503
+			c0-1.761,1.465-3.188,3.273-3.188h15.275c1.807,0,3.272,1.428,3.272,3.188V28.754z M9.454,23.44h13.092v-1.063H9.454V23.44z
+			 M9.454,20.251h13.092v-1.062H9.454V20.251z"/>
+	</g>
+</g>
+</svg>