From f170d3a4ba4697944d02ae370083ea1da3e1f726 Mon Sep 17 00:00:00 2001 From: saifsultanc Date: Sat, 8 Mar 2025 10:34:24 +0530 Subject: [PATCH 1/2] `gwaft-template-collapsible.php`: Fixed an issue with page numbers and hidden fields. --- gravity-forms/gwaft-template-collapsible.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gravity-forms/gwaft-template-collapsible.php b/gravity-forms/gwaft-template-collapsible.php index 0f14e243e..57e77defe 100644 --- a/gravity-forms/gwaft-template-collapsible.php +++ b/gravity-forms/gwaft-template-collapsible.php @@ -25,7 +25,14 @@ $pages = $data['form']['pagination']['pages']; $page_groups = array(); foreach ( $data['items'] as $item ) { - $page_groups[ $item['field']['pageNumber'] ][] = $item; + $field = $item['field']; + // Skip hidden fields. + if ( $field->type == 'hidden' || $field->visibility == 'hidden' ) { + continue; + } + // Adjust pageNumber to be zero-based. + $page_index = $field->pageNumber - 1; + $page_groups[ $page_index ][] = $item; } ob_start(); ?> From 64678369a9234cee904e4f91a347fa43ac99b771 Mon Sep 17 00:00:00 2001 From: Saif Sultan Date: Wed, 12 Mar 2025 12:00:42 +0530 Subject: [PATCH 2/2] `gwaft-template-collapsible.php`: Fixed an issue with page numbers and hidden fields. Co-authored-by: Matt Ehlinger --- gravity-forms/gwaft-template-collapsible.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gravity-forms/gwaft-template-collapsible.php b/gravity-forms/gwaft-template-collapsible.php index 57e77defe..6097a031c 100644 --- a/gravity-forms/gwaft-template-collapsible.php +++ b/gravity-forms/gwaft-template-collapsible.php @@ -27,7 +27,7 @@ foreach ( $data['items'] as $item ) { $field = $item['field']; // Skip hidden fields. - if ( $field->type == 'hidden' || $field->visibility == 'hidden' ) { + if ( $field->type === 'hidden' || $field->visibility === 'hidden' ) { continue; } // Adjust pageNumber to be zero-based.