gpnf-override-parent-merge-tag-on-submission.php: Fixed override parent merge tag on submission.

Author: saifsultanc

gp-nested-forms/gpnf-override-parent-merge-tag-on-submission.php

@@ -76,14 +76,10 @@ function override_parent_merge_tags( $entry, $form ) {
 				/**
 				 * note: if include_field_ids exists, we should ignore exclude_field_ids
 				 */
-				$should_include = in_array( $child_field->id, $this->include_field_ids );
+				$should_include = empty( $this->include_field_ids ) ? true : in_array( $child_field->id, $this->include_field_ids );
 				$should_exclude = in_array( $child_field->id, $this->exclude_field_ids );
 
-				if ( empty( $this->include_field_ids ) && $should_exclude ) {
-					continue;
-				}
-
-				if ( ! $should_include ) {
+				if ( ! $should_include || $should_exclude ) {
 					continue;
 				}