From 4ae3b94bce6b2f26002c1a50247a01ab4cf2219a Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Fri, 22 Apr 2016 05:27:43 -0400
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'
---
interface/web/index.php | 4 +++-
interface/web/login/index.php | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/interface/web/index.php b/interface/web/index.php
index c8d836d..4a21032 100644
--- a/interface/web/index.php
+++ b/interface/web/index.php
@@ -109,7 +109,9 @@
$app->tpl->setVar('base64_logo_txt', $base64_logo_txt);
// Title
-$app->tpl->setVar('company_name', $sys_config['company_name']. ' :: ');
+if (!empty($sys_config['company_name'])) {
+ $app->tpl->setVar('company_name', $sys_config['company_name']. ' :: ');
+}
$app->tpl_defaults();
$app->tpl->pparse();
diff --git a/interface/web/login/index.php b/interface/web/login/index.php
index ef5ee5f..ece79a9 100644
--- a/interface/web/login/index.php
+++ b/interface/web/login/index.php
@@ -341,7 +341,9 @@
$app->tpl->setVar('base64_logo_txt', $base64_logo_txt);
// Title
-$app->tpl->setVar('company_name', $sys_config['company_name']. ' :: ');
+if (!empty($sys_config['company_name'])) {
+ $app->tpl->setVar('company_name', $sys_config['company_name']. ' :: ');
+}
// Custom Login
if ($sys_config['custom_login_text'] != '') {
--
Gitblit v1.9.1