Don't OR options together.

By default FILTER_VALIDATE_IP does both.
ceeram · Jun 11, 2012 · c318586 · c318586
1 parent 963f1ca
commit c318586
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/Cake/Utility/Validation.php b/lib/Cake/Utility/Validation.php
@@ -468,11 +468,11 @@ public static function extension($check, $extensions = array('gif', 'jpeg', 'png
 	public static function ip($check, $type = 'both') {
 		$type = strtolower($type);
 		$flags = 0;
-		if ($type === 'ipv4' || $type === 'both') {
-			$flags |= FILTER_FLAG_IPV4;
+		if ($type === 'ipv4') {
+			$flags = FILTER_FLAG_IPV4;
 		}
-		if ($type === 'ipv6' || $type === 'both') {
-			$flags |= FILTER_FLAG_IPV6;
+		if ($type === 'ipv6') {
+			$flags = FILTER_FLAG_IPV6;
 		}
 		return (boolean)filter_var($check, FILTER_VALIDATE_IP, array('flags' => $flags));
 	}