From eae07504fafcb77d64f29b2a73089f7d2a98f864 Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Mon, 15 Jul 2019 22:03:57 +0200
Subject: [PATCH] Resolved gh-442 to add a default catch all option to the
 setDynamicField method in the field class of the compiler.

---
 admin/helpers/compiler/c_Fields.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/admin/helpers/compiler/c_Fields.php b/admin/helpers/compiler/c_Fields.php
index 4eb73f5cd..9e830fecd 100644
--- a/admin/helpers/compiler/c_Fields.php
+++ b/admin/helpers/compiler/c_Fields.php
@@ -1089,16 +1089,6 @@ class Fields extends Structure
 						$this->setBuilders($langLabel, $langView, $view_name_single, $view_name_list, $name, $view, $field, $typeName, $multiple, false, $optionArray);
 					}
 				}
-				elseif (ComponentbuilderHelper::fieldCheck($typeName, 'plain'))
-				{
-					if ($build)
-					{
-						// set builders
-						$this->setBuilders($langLabel, $langView, $view_name_single, $view_name_list, $name, $view, $field, $typeName, $multiple);
-					}
-					// now add to the field set
-					$dynamicField = $this->setField('plain', $fieldAttributes, $name, $typeName, $langView, $view_name_single, $view_name_list, $placeholders, $optionArray);
-				}
 				elseif (ComponentbuilderHelper::fieldCheck($typeName, 'spacer'))
 				{
 					if ($build)
@@ -1150,6 +1140,16 @@ class Fields extends Structure
 					// now add to the field set
 					$dynamicField = $this->setField('custom', $fieldAttributes, $name, $typeName, $langView, $view_name_single, $view_name_list, $placeholders, $optionArray, $custom);
 				}
+				else
+				{
+					if ($build)
+					{
+						// set builders
+						$this->setBuilders($langLabel, $langView, $view_name_single, $view_name_list, $name, $view, $field, $typeName, $multiple);
+					}
+					// now add to the field set
+					$dynamicField = $this->setField('plain', $fieldAttributes, $name, $typeName, $langView, $view_name_single, $view_name_list, $placeholders, $optionArray);
+				}
 			}
 		}
 		return $dynamicField;