From 741aa6aa3ec188aa4f37b26dc3314e2d0cd811aa Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Thu, 07 May 2015 11:43:50 -0400
Subject: [PATCH] Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3
---
install/install.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/install/install.php b/install/install.php
index ae1f566..12e0178 100644
--- a/install/install.php
+++ b/install/install.php
@@ -171,7 +171,7 @@
//** Get the hostname
$tmp_out = array();
exec('hostname -f', $tmp_out);
-$conf['hostname']=$tmp_out[0];
+$conf['hostname'] = @$tmp_out[0];
unset($tmp_out);
//** Prevent empty hostname
$check = false;
@@ -869,4 +869,4 @@
echo "Installation completed.\n";
-?>
+?>
\ No newline at end of file
--
Gitblit v1.9.1