move the normalizing logic to the public function

cakephp · Nov 2, 2014 · e118155 · e118155
1 parent c9ed7c1
commit e118155
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/src/Network/Request.php b/src/Network/Request.php
@@ -583,6 +583,16 @@ public function __isset($name) {
  * @return bool Whether or not the request is the type you are checking.
  */
 	public function is($type) {
+		if (is_array($type)) {
+			$result = array_map(array($this, 'is'), $type);
+			return count(array_filter($result)) > 0;
+		}
+
+		$type = strtolower($type);
+		if (!isset(static::$_detectors[$type])) {
+			return false;
+		}
+
 		if (!isset($this->_isResults[$type])) {
 			$this->_isResults[$type] = $this->_is($type);
 		}
@@ -598,14 +608,6 @@ public function is($type) {
  * @return bool Whether or not the request is the type you are checking.
  */
 	protected function _is($type) {
-		if (is_array($type)) {
-			$result = array_map(array($this, 'is'), $type);
-			return count(array_filter($result)) > 0;
-		}
-		$type = strtolower($type);
-		if (!isset(static::$_detectors[$type])) {
-			return false;
-		}
 		$detect = static::$_detectors[$type];
 		if (is_callable($detect)) {
 			return call_user_func($detect, $this);