Merge pull request #1242 from xwp/bugfix/records-exclude-rules

"Log::record_matches_rules()" refactored.

classes/class-log.php

@@ -242,23 +242,25 @@ public function is_record_excluded( $connector, $context, $action, $user = null,
 	 * @return boolean
 	 */
 	public function record_matches_rules( $record, $exclude_rules ) {
+		$matches_needed = count( $exclude_rules );
+		$matches_found  = 0;
 		foreach ( $exclude_rules as $exclude_key => $exclude_value ) {
-			if ( ! isset( $record[ $exclude_key ] ) ) {
+			if ( ! isset( $record[ $exclude_key ] ) || is_null( $exclude_value ) ) {
 				continue;
 			}
 
 			if ( 'ip_address' === $exclude_key ) {
 				$ip_addresses = explode( ',', $exclude_value );
 
 				if ( in_array( $record['ip_address'], $ip_addresses, true ) ) {
-					return true;
+					$matches_found++;
 				}
 			} elseif ( $record[ $exclude_key ] === $exclude_value ) {
-				return true;
+				$matches_found++;
 			}
 		}
 
-		return false;
+		return $matches_found === $matches_needed;
 	}
 
 	/**