From 6368225a5e3f498e02e97b742437cbdb2498bc69 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Sun, 31 Jan 2016 06:27:10 -0500
Subject: [PATCH] Fixed: FS#4077 - php update.php --autoinstall=autoinstall.conf.php does not run non-interactive
---
install/lib/installer_base.lib.php | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index d3b3364..607b7cd 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -68,6 +68,12 @@
} else {
$input = $autoinstall[$name];
}
+ } elseif($name != '' && $autoupdate[$name] != '') {
+ if($autoupdate[$name] == 'default') {
+ $input = $default;
+ } else {
+ $input = $autoupdate[$name];
+ }
} else {
$answers_str = implode(',', $answers);
swrite($this->lng($query).' ('.$answers_str.') ['.$default.']: ');
@@ -105,6 +111,12 @@
} else {
$input = $autoinstall[$name];
}
+ } elseif($name != '' && $autoupdate[$name] != '') {
+ if($autoupdate[$name] == 'default') {
+ $input = $default;
+ } else {
+ $input = $autoupdate[$name];
+ }
} else {
swrite($this->lng($query).' ['.$default.']: ');
$input = sread();
--
Gitblit v1.9.1