From c38c2048241378267a70fcbe77431164ed7936fe Mon Sep 17 00:00:00 2001
From: Ryan Cramer <ryan@processwire.com>
Date: Fri, 3 May 2024 13:47:50 -0400
Subject: [PATCH] Update Fieldgroup::getPageInputfields() to support
 user-specified $container element (InputfieldWrapper) rather than creating
 one (as used by PageEditChildren module)

---
 wire/core/Fieldgroup.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/wire/core/Fieldgroup.php b/wire/core/Fieldgroup.php
index 9166cc46..8cc9e27c 100644
--- a/wire/core/Fieldgroup.php
+++ b/wire/core/Fieldgroup.php
@@ -518,6 +518,7 @@ class Fieldgroup extends WireArray implements Saveable, Exportable, HasLookupIte
 	 *  - `namespace` (string): Additional namespace for Inputfield context. 
 	 *  - `flat` (bool): Return all Inputfields in a flattened InputfieldWrapper?
 	 *  - `populate` (bool): Populate page values to Inputfields? (default=true) since 3.0.208
+	 *  - `container` (InputfieldWrapper): The InputfieldWrapper element to add fields into, or omit for new. since 3.0.239
 	 * @param string|array $fieldName Limit to a particular fieldName(s) or field IDs (optional).
 	 *  - If specifying a single field (name or ID) and it refers to a fieldset, then all fields in that fieldset will be included. 
 	 *  - If specifying an array of field names/IDs the returned InputfieldWrapper will maintain the requested order. 
@@ -536,6 +537,7 @@ class Fieldgroup extends WireArray implements Saveable, Exportable, HasLookupIte
 				'namespace' => $namespace,
 				'flat' => $flat, 
 				'populate' => true, // populate page values?
+				'container' => null, 
 			);
 			$options = $contextStr;
 			$options = array_merge($defaults, $options);
@@ -544,11 +546,16 @@ class Fieldgroup extends WireArray implements Saveable, Exportable, HasLookupIte
 			$namespace = $options['namespace'];
 			$populate = (bool) $options['populate'];
 			$flat = $options['flat'];
+			$container = $options['container'];
 		} else {
 			$populate = true;
+			$container = null;
+		}
+	
+		if(!$container instanceof InputfieldWrapper) {
+			$container = $this->wire(new InputfieldWrapper());
 		}
 		
-		$container = $this->wire(new InputfieldWrapper());
 		$containers = array();
 		$inFieldset = false;
 		$inHiddenFieldset = false;
@@ -777,5 +784,3 @@ class Fieldgroup extends WireArray implements Saveable, Exportable, HasLookupIte
 	}
 
 }
-
-