From 74b68e507a79bc9164cf560b3a23007da464d777 Mon Sep 17 00:00:00 2001
From: Diego Najar <dignajar@gmail.com>
Date: Fri, 21 Dec 2018 20:16:00 +0100
Subject: [PATCH] Site logo implementation

---
 bl-kernel/admin/views/settings.php | 2 +-
 bl-kernel/site.class.php           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bl-kernel/admin/views/settings.php b/bl-kernel/admin/views/settings.php
index 4d57fba3..38050bf9 100644
--- a/bl-kernel/admin/views/settings.php
+++ b/bl-kernel/admin/views/settings.php
@@ -475,7 +475,7 @@
 			<label class="custom-file-label" for="jssiteLogoInputFile"><?php $L->p('Choose images to upload'); ?></label>
 		</div>
 		<div>
-			<img id="jssiteLogoPreview" class="img-fluid img-thumbnail" alt="Site logo preview" src="<?php echo (Sanitize::pathFile(PATH_UPLOADS.$site->logo(false))?DOMAIN_UPLOADS.$site->logo(false).'?version='.time():HTML_PATH_ADMIN_THEME_IMG.'default.svg') ?>" />
+			<img id="jssiteLogoPreview" class="img-fluid img-thumbnail" alt="Site logo preview" src="<?php echo ($site->logo()?DOMAIN_UPLOADS.$site->logo(false).'?version='.time():HTML_PATH_ADMIN_THEME_IMG.'default.svg') ?>" />
 		</div>
 		<script>
 		$("#jssiteLogoInputFile").on("change", function() {
diff --git a/bl-kernel/site.class.php b/bl-kernel/site.class.php
index 7da8a13a..9e4620b1 100644
--- a/bl-kernel/site.class.php
+++ b/bl-kernel/site.class.php
@@ -274,7 +274,7 @@ class Site extends dbJSON {
 	public function logo($absolute=true)
 	{
 		$logo = $this->getField('logo');
-		if ($absolute) {
+		if ($absolute && $logo) {
 			return DOMAIN_UPLOADS.$logo;
 		}
 		return $logo;