From b1bad807f8bf8823c35d4ea735172753641909b7 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Sat, 23 Mar 2019 08:42:15 -0600
Subject: [PATCH] Update template.php

---
 themes/default/template.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/themes/default/template.php b/themes/default/template.php
index 42f4439482..dd9b6b32d5 100644
--- a/themes/default/template.php
+++ b/themes/default/template.php
@@ -559,24 +559,29 @@
 					echo "<div id='menu_side_container'>";
 					//menu brand image/text
 						echo "<div id='menu_side_brand_container'>\n";
-						//define menu brand link
+						//define the menu brand link
 							if (strlen(PROJECT_PATH) > 0) {
 								$menu_brand_link = PROJECT_PATH;
 							}
 							else if (!$default_login) {
 								$menu_brand_link = '/';
 							}
-						//define menu brand mark
+						//show the menu brand
+							$menu_brand_image = ($_SESSION['theme']['menu_brand_image']['text'] != '') ? escape($_SESSION['theme']['menu_brand_image']['text']) : PROJECT_PATH."/themes/default/images/logo.png";
 							$menu_brand_text = ($_SESSION['theme']['menu_brand_text']['text'] != '') ? escape($_SESSION['theme']['menu_brand_text']['text']) : "FusionPBX";
 							if ($_SESSION['theme']['menu_brand_type']['text'] == 'image' || $_SESSION['theme']['menu_brand_type']['text'] == '') {
-								$menu_brand_image = ($_SESSION['theme']['menu_brand_image']['text'] != '') ? escape($_SESSION['theme']['menu_brand_image']['text']) : PROJECT_PATH."/themes/default/images/logo.png";
 								echo "<a href='".$menu_brand_link."' style='text-decoration: none;'>";
 								echo "<img id='menu_brand_image' src='".$menu_brand_image."' title=\"".escape($menu_brand_text)."\">";
-								if ($menu_brand_text != '') { echo "<span class='menu_brand_text'>".$menu_brand_text."</span>"; }
+								echo "</a>";
+							}
+							else if ($_SESSION['theme']['menu_brand_type']['text'] == 'both') {
+								echo "<a href='".$menu_brand_link."' style='text-decoration: none;'>";
+								echo "<img id='menu_brand_image' src='".$menu_brand_image."' title=\"".escape($menu_brand_text)."\">";
+								echo "<span class='menu_brand_text'>".$menu_brand_text."</span>";
 								echo "</a>";
 							}
 							else if ($_SESSION['theme']['menu_brand_type']['text'] == 'text') {
-								echo "<a class='menu_brand_text' href=\"".$menu_brand_link."\">".$menu_brand_text."</a>\n";
+								echo "<a class='menu_brand_text' href=\"".$menu_brand_link."\">".$menu_brand_text."22</a>\n";
 							}
 						echo "</div>\n";
 					//main menu items