From 02bf997271f4d09e91c8fcb9cecd08f06f2400c4 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 12 Apr 2012 12:04:52 -0400
Subject: [PATCH] Merged revisions 3028-3045 from stable branch.

---
 interface/lib/app.inc.php |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/interface/lib/app.inc.php b/interface/lib/app.inc.php
index 7fa8c03..432fdab 100755
--- a/interface/lib/app.inc.php
+++ b/interface/lib/app.inc.php
@@ -216,11 +216,14 @@
 			$this->tpl->setVar('app_version', '');
 		}
 		$this->tpl->setVar('app_link', $this->_conf['app_link']);
+		/*
 		if(isset($this->_conf['app_logo']) && $this->_conf['app_logo'] != '' && @is_file($this->_conf['app_logo'])) {
 			$this->tpl->setVar('app_logo', '<img src="'.$this->_conf['app_logo'].'">');
 		} else {
 			$this->tpl->setVar('app_logo', '&nbsp;');
 		}
+		*/
+		$this->tpl->setVar('app_logo', $this->_conf['logo']);
 
 		$this->tpl->setVar('phpsessid', session_id());
 

--
Gitblit v1.9.1