Reviewing the logic in the Shell::in($prompt, $options = null, $defau…

…lt = null)
cakephp · Jan 16, 2012 · ddbaa66 · ddbaa66
1 parent c832646
commit ddbaa66
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/Cake/Console/Command/Task/DbConfigTask.php b/lib/Cake/Console/Command/Task/DbConfigTask.php
@@ -87,7 +87,7 @@ public function execute() {
  */
 	protected function _interactive() {
 		$this->hr();
-		$this->out('Database Configuration:');
+		$this->out(__d('cake_console', 'Database Configuration:'));
 		$this->hr();
 		$done = false;
 		$dbConfigs = array();

diff --git a/lib/Cake/Console/Shell.php b/lib/Cake/Console/Shell.php
@@ -456,7 +456,7 @@ public function in($prompt, $options = null, $default = null) {
 			}
 		}
 		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);
 			}
 		}