Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

install/install.php

@@ -171,7 +171,7 @@ $install_mode = $inst->simple_query('Installation mode', array('standard', 'expe
 //** 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 @@ chmod($md5_filename,0700);
 echo "Installation completed.\n";
 
 
-?>
+?>
\ No newline at end of file