Merge branch 'master' into 'stable-3.1'

layout-fix for company name



See merge request !319

Author: Till Brehm

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();

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'] != '') {