From 6c2a7ac4dde47e6267b08ce0a3b65cf188743768 Mon Sep 17 00:00:00 2001
From: gravitypdf-bot <support@gravitypdf.com>
Date: Mon, 26 Oct 2026 17:35:41 +1100
Subject: [PATCH] Use the form's description placement for Consent fields set
 to "Use Form Setting" (6.18.0)

Backport of #1960 (c47d9c10).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 CHANGELOG.md                                  |  1 +
 src/Helper/Fields/Field_Consent.php           |  3 +-
 .../Helper/Fields/Test_Field_Consent.php      | 37 +++++++++++++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6367d766..7128b9e70 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -61,6 +61,7 @@
 * 🐞 Bug: Stop the code inside `<script>` elements showing as text in the PDF
 * 🐞 Bug: Don't leave PDF generation filters attached when a PDF fails to generate
 * 🐞 Bug: Stop bypassing Populate Anything's live merge tag whitelist after a PDF is generated
+* 🐞 Bug: Use the form's description placement for Consent fields set to "Use Form Setting"
 * 💻 Developer: Add `GPDFAPI::get_pdf_url()` to get the URL to an entry's PDF, optionally signed
 * 💻 Developer: `$form_data` field values now encode shortcode and merge tag characters (`[ ] { }`) so they aren't processed
 * 💻 Developer: A `gfpdf_get_option_logged_out_timeout` filter returning 0 now expires IP-based logged-out access immediately, instead of turning off the Logged Out Timeout
diff --git a/src/Helper/Fields/Field_Consent.php b/src/Helper/Fields/Field_Consent.php
index c56d73076..e86d4810c 100644
--- a/src/Helper/Fields/Field_Consent.php
+++ b/src/Helper/Fields/Field_Consent.php
@@ -105,7 +105,8 @@ public function value() {
 					$this->gform->process_tags( $this->field->get_field_description_from_revision( $value[2] ), $this->form, $this->entry )
 				)
 			),
-			'placement'   => $this->field->descriptionPlacement,
+			/* An empty field setting means "Use Form Setting" */
+			'placement'   => $this->field->descriptionPlacement ?: ( $this->form['descriptionPlacement'] ?? '' ),
 		];
 
 		$this->cache( $consent );
diff --git a/tests/phpunit/unit-tests/Helper/Fields/Test_Field_Consent.php b/tests/phpunit/unit-tests/Helper/Fields/Test_Field_Consent.php
index 5e3765e85..bd93cb76f 100644
--- a/tests/phpunit/unit-tests/Helper/Fields/Test_Field_Consent.php
+++ b/tests/phpunit/unit-tests/Helper/Fields/Test_Field_Consent.php
@@ -93,4 +93,41 @@ public function test_if_skip_when_not_consented() {
 
 		$this->assertStringContainsString( 'consent-accepted-label', $this->pdf_field->html() );
 	}
+
+	/**
+	 * @dataProvider provider_description_placement
+	 */
+	public function test_description_placement( $field_placement, $form_placement, $expected ) {
+		$this->gf_field->description          = 'Consent description';
+		$this->gf_field->descriptionPlacement = $field_placement;
+
+		$form                         = $this->form;
+		$form['descriptionPlacement'] = $form_placement;
+		add_filter( 'gfpdf_current_form_object', fn() => $form );
+
+		$entry = [
+			'form_id'                  => $this->form['id'],
+			'id'                       => '0',
+			$this->gf_field->id . '.1' => '1',
+			$this->gf_field->id . '.2' => '',
+			$this->gf_field->id . '.3' => '',
+		];
+
+		$pdf_field = new Field_Consent( $this->gf_field, $entry, \GPDFAPI::get_form_class(), \GPDFAPI::get_misc_class() );
+		$html      = $pdf_field->html();
+
+		$this->assertSame( $expected, $pdf_field->value()['placement'] );
+		$description_first = strpos( $html, 'consent-text' ) < strpos( $html, 'consent-accepted-label' );
+		$this->assertSame( $expected === 'above', $description_first );
+	}
+
+	public function provider_description_placement() {
+		return [
+			'inherits form above'     => [ '', 'above', 'above' ],
+			'inherits form below'     => [ '', 'below', 'below' ],
+			'field overrides form'    => [ 'below', 'above', 'below' ],
+			'field above, form unset' => [ 'above', '', 'above' ],
+			'neither set'             => [ '', '', '' ],
+		];
+	}
 }