From bed49c931dff27e5144958773385ff5bd8f459b9 Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Tue, 24 May 2011 22:24:06 +0000 Subject: [PATCH] - Fixed bug #54912 (filter/logical_filters.c:685:32: warning: use of logical || with constant op) Initial patch by: crrodriguez at opensuse dot org --- ext/filter/logical_filters.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c index 59af952c12..8dc98fdd1a 100644 --- a/ext/filter/logical_filters.c +++ b/ext/filter/logical_filters.c @@ -682,7 +682,7 @@ void php_filter_validate_ip(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */ RETURN_VALIDATION_FAILED } - if (flags & (FILTER_FLAG_IPV4 || FILTER_FLAG_IPV6)) { + if (flags & (FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6)) { /* Both formats are cool */ } else if ((flags & FILTER_FLAG_IPV4) && mode == FORMAT_IPV6) { RETURN_VALIDATION_FAILED -- 2.50.1