Skip to content

Commit 6368225

Browse files
author
Till Brehm
committed
Fixed: FS#4077 - php update.php --autoinstall=autoinstall.conf.php does not run non-interactive
1 parent 0a0647d commit 6368225

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

install/lib/installer_base.lib.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,12 @@ public function simple_query($query, $answers, $default, $name = '') {
6868
} else {
6969
$input = $autoinstall[$name];
7070
}
71+
} elseif($name != '' && $autoupdate[$name] != '') {
72+
if($autoupdate[$name] == 'default') {
73+
$input = $default;
74+
} else {
75+
$input = $autoupdate[$name];
76+
}
7177
} else {
7278
$answers_str = implode(',', $answers);
7379
swrite($this->lng($query).' ('.$answers_str.') ['.$default.']: ');
@@ -105,6 +111,12 @@ public function free_query($query, $default, $name = '') {
105111
} else {
106112
$input = $autoinstall[$name];
107113
}
114+
} elseif($name != '' && $autoupdate[$name] != '') {
115+
if($autoupdate[$name] == 'default') {
116+
$input = $default;
117+
} else {
118+
$input = $autoupdate[$name];
119+
}
108120
} else {
109121
swrite($this->lng($query).' ['.$default.']: ');
110122
$input = sread();

0 commit comments

Comments
 (0)