Commit 6368225a authored by Till Brehm's avatar Till Brehm

Fixed: FS#4077 - php update.php --autoinstall=autoinstall.conf.php does not run non-interactive

parent 0a0647df
......@@ -68,6 +68,12 @@ class installer_base {
} 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 @@ class installer_base {
} 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();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment