From 7eade0da5ec04ec86a89aed3c98e27cba3dae491 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Thu, 7 May 2015 14:33:08 +0200
Subject: [PATCH] avoid the second use of query in install.php
---
install/install.php | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/install/install.php b/install/install.php
index a8e2abc18c..5dc1318849 100644
--- a/install/install.php
+++ b/install/install.php
@@ -172,10 +172,11 @@ $install_mode = $inst->simple_query('Installation mode', array('standard', 'expe
$tmp_out = array();
exec('hostname -f', $tmp_out);
$conf['hostname'] = $inst->free_query('Full qualified hostname (FQDN) of the server, eg server1.domain.tld ', @$tmp_out[0],'hostname');
-unset($tmp_out);
//** Prevent empty hostname
-$conf['hostname']=trim($conf['hostname']);
+$conf['hostname']=trim(@$tmp_out[0]);
+unset($tmp_out);
+
if($conf['hostname'] === '') {
$check = false;
do {
--
GitLab