From c4fb095eba5e3bc715fc4f4ae4a0cd4491a0285c Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Fri, 8 May 2020 19:16:04 -0400
Subject: [PATCH] Fix settings page subforms (so all the fields show for the
 cache)

---
 app/views/settings/_field.php    |  5 +++++
 app/views/settings/_form.php     | 16 ++++++++--------
 app/views/settings/_subfield.php | 20 ++++++++++++++++++++
 3 files changed, 33 insertions(+), 8 deletions(-)
 create mode 100644 app/views/settings/_field.php
 create mode 100644 app/views/settings/_subfield.php

diff --git a/app/views/settings/_field.php b/app/views/settings/_field.php
new file mode 100644
index 00000000..94d5e031
--- /dev/null
+++ b/app/views/settings/_field.php
@@ -0,0 +1,5 @@
+<article>
+	<label for="<?= $fieldName ?>"><?= $field['title'] ?></label><br />
+	<small><?= $field['description'] ?></small><br />
+	<?= $helper->field($fieldName, $field); ?>
+</article>
\ No newline at end of file
diff --git a/app/views/settings/_form.php b/app/views/settings/_form.php
index eccaf1ec..9112d175 100644
--- a/app/views/settings/_form.php
+++ b/app/views/settings/_form.php
@@ -6,19 +6,19 @@
 ?>
 
 <?php foreach ($fields as $name => $field): ?>
-	<?php $fieldname = ($section === 'config' || $nestedPrefix !== 'config') ? "{$nestedPrefix}[{$name}]" : "{$nestedPrefix}[{$section}][{$name}]"; ?>
+	<?php
+		$fieldName = ($section === 'config' || $nestedPrefix !== 'config')
+				? "{$nestedPrefix}[{$name}]"
+				: "{$nestedPrefix}[{$section}][{$name}]";
+	?>
 	<?php if ($field['type'] === 'subfield'): ?>
 		<section>
 			<h4><?= $field['title'] ?></h4>
-			<?php include_once '_form.php'; ?>
+			<?php include '_subfield.php'; ?>
 		</section>
 	<?php elseif ( ! empty($field['display'])): ?>
-		<article>
-			<label for="<?= $fieldname ?>"><?= $field['title'] ?></label><br />
-			<small><?= $field['description'] ?></small><br />
-			<?= $helper->field($fieldname, $field); ?>
-		</article>
+		<?php include '_field.php' ?>
 	<?php else: ?>
-		<?php $hiddenFields[] = $helper->field($fieldname, $field); ?>
+		<?php $hiddenFields[] = $helper->field($fieldName, $field); ?>
 	<?php endif ?>
 <?php endforeach ?>
diff --git a/app/views/settings/_subfield.php b/app/views/settings/_subfield.php
new file mode 100644
index 00000000..0de2297c
--- /dev/null
+++ b/app/views/settings/_subfield.php
@@ -0,0 +1,20 @@
+<?php
+// Higher scoped variables:
+// $field
+// $fields
+// $hiddenFields
+// $nestedPrefix
+?>
+
+<?php foreach ($field['fields'] as $name => $field): ?>
+	<?php
+		$fieldName = ($section === 'config' || $nestedPrefix !== 'config')
+			? "{$nestedPrefix}[{$name}]"
+			: "{$nestedPrefix}[{$section}][{$name}]";
+	?>
+	<?php if ( ! empty($field['display'])): ?>
+		<?php include '_field.php' ?>
+	<?php else: ?>
+		<?php $hiddenFields[] = $helper->field($fieldName, $field); ?>
+	<?php endif ?>
+<?php endforeach ?>
\ No newline at end of file