--- php/ext/filter/filter.c	2007/01/01 09:36:00	1.52.2.38
+++ php/ext/filter/filter.c	2007/04/04 20:50:26	1.52.2.39
@@ -776,8 +776,10 @@
 		return;
 	}
 
-	if (op && ( (Z_TYPE_PP(op) == IS_LONG && !PHP_FILTER_ID_EXISTS(Z_LVAL_PP(op)))
-		|| Z_TYPE_PP(op) != IS_ARRAY)) {
+	if (op
+		&& (Z_TYPE_PP(op) != IS_ARRAY)
+		&& (Z_TYPE_PP(op) == IS_LONG && !PHP_FILTER_ID_EXISTS(Z_LVAL_PP(op)))
+		) {
 		RETURN_FALSE;
 	}
 
@@ -815,8 +817,10 @@
 		return;
 	}
 
-	if (op && ( (Z_TYPE_PP(op) == IS_LONG && !PHP_FILTER_ID_EXISTS(Z_LVAL_PP(op)))
-		|| Z_TYPE_PP(op) != IS_ARRAY)) {
+	if (op
+		&& (Z_TYPE_PP(op) != IS_ARRAY)
+		&& (Z_TYPE_PP(op) == IS_LONG && !PHP_FILTER_ID_EXISTS(Z_LVAL_PP(op)))
+		) {
 		RETURN_FALSE;
 	}