fix shell help for incorrect user input

This commit is contained in:
slimus 2012-01-28 16:36:59 +07:00
parent 752711e963
commit 57e4751a82

View file

@ -453,7 +453,8 @@ class Shell extends Object {
if (!$this->interactive) { if (!$this->interactive) {
return $default; return $default;
} }
$in = $this->_getInput($prompt, $options, $default); $original_options = $options;
$in = $this->_getInput($prompt, $original_options, $default);
if ($options && is_string($options)) { if ($options && is_string($options)) {
if (strpos($options, ',')) { if (strpos($options, ',')) {
@ -471,7 +472,7 @@ class Shell extends Object {
$options $options
); );
while ($in === '' || !in_array($in, $options)) { while ($in === '' || !in_array($in, $options)) {
$in = $this->_getInput($prompt, $options, $default); $in = $this->_getInput($prompt, $original_options, $default);
} }
} }
return $in; return $in;