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

Merge pull request #411 from fitorec/2.0

Browse source 
Check the logic in the Shell::in($prompt, $options = null, $default = null)
This commit is contained in:
Mark Story 2012-01-17 18:53:00 -08:00
commit e080bb27b9
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Console/Command/Task/DbConfigTask.php
View file

@ -87,7 +87,7 @@ class DbConfigTask extends AppShell {
*/
protected function _interactive() {
$this->hr();
$this->out('Database Configuration:');
$this->out(__d('cake_console', 'Database Configuration:'));
$this->hr();
$done = false;
$dbConfigs = array();

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

@ -465,7 +465,7 @@ class Shell extends Object {
}
}
if (is_array($options)) {
while ($in === '' || ($in !== '' && (!in_array(strtolower($in), $options) && !in_array(strtoupper($in), $options)) && !in_array($in, $options))) {
while ($in === '' || !(in_array(strtolower($in), $options) || in_array(strtoupper($in), $options) || in_array($in, $options))) {
$in = $this->_getInput($prompt, $options, $default);
}
}