Simplify how options are checked.

cakephp · Jan 18, 2012 · 5e495ad · 5e495ad
1 parent e080bb2
commit 5e495ad
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/lib/Cake/Console/Shell.php b/lib/Cake/Console/Shell.php
@@ -465,7 +465,12 @@ public function in($prompt, $options = null, $default = null) {
 			}
 		}
 		if (is_array($options)) {
-			while ($in === '' || !(in_array(strtolower($in), $options) || in_array(strtoupper($in), $options) || in_array($in, $options))) {
+			$options = array_merge(
+				array_map('strtolower', $options),
+				array_map('strtoupper', $options),
+				$options
+			);
+			while ($in === '' || !in_array($in, $options)) {
 				$in = $this->_getInput($prompt, $options, $default);
 			}
 		}