adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #447 from slimus/2.1

Browse source 
2.1 fix bake shell options
This commit is contained in:
José Lorenzo Rodríguez 2012-01-28 09:12:53 -08:00
commit f28ba9002a
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/Cake/Console/Shell.php
View file

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