From 0be8492db6afe63305c247d82d332809a2a34b21 Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Thu, 24 Dec 2020 18:53:43 +0200
Subject: [PATCH] Fixed gh-630 by moving the templatestyle field type to the
 plain field group.

---
 admin/helpers/componentbuilder.php | 4 ++--
 site/helpers/componentbuilder.php  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php
index f267804de..5e5b33f69 100644
--- a/admin/helpers/componentbuilder.php
+++ b/admin/helpers/componentbuilder.php
@@ -3677,7 +3677,7 @@ abstract class ComponentbuilderHelper
 		),
 		'plain' => array(
 			'cachehandler', 'calendar', 'checkbox', 'chromestyle', 'color', 'componentlayout', 'contenttype', 'editor', 'editors', 'captcha',
-			'email', 'file', 'headertag', 'helpsite', 'hidden', 'integer', 'language', 'media', 'menu', 'menuitem', 'meter', 'modulelayout',
+			'email', 'file', 'headertag', 'helpsite', 'hidden', 'integer', 'language', 'media', 'menu', 'menuitem', 'meter', 'modulelayout', 'templatestyle',
 			'moduleorder', 'moduletag', 'number', 'password', 'range', 'rules', 'tag', 'tel', 'text', 'textarea', 'timezone', 'url', 'user', 'usergroup'
 		),
 		'option' => array(
@@ -3697,7 +3697,7 @@ abstract class ComponentbuilderHelper
 			'note', 'spacer'
 		),
 		'special' => array(
-			'contentlanguage', 'moduleposition', 'plugin', 'repeatable', 'subform', 'templatestyle'
+			'contentlanguage', 'moduleposition', 'plugin', 'repeatable', 'subform'
 		)
 	);
 
diff --git a/site/helpers/componentbuilder.php b/site/helpers/componentbuilder.php
index 1010cf4e7..f1f9dcf84 100644
--- a/site/helpers/componentbuilder.php
+++ b/site/helpers/componentbuilder.php
@@ -3674,7 +3674,7 @@ abstract class ComponentbuilderHelper
 		),
 		'plain' => array(
 			'cachehandler', 'calendar', 'checkbox', 'chromestyle', 'color', 'componentlayout', 'contenttype', 'editor', 'editors', 'captcha',
-			'email', 'file', 'headertag', 'helpsite', 'hidden', 'integer', 'language', 'media', 'menu', 'menuitem', 'meter', 'modulelayout',
+			'email', 'file', 'headertag', 'helpsite', 'hidden', 'integer', 'language', 'media', 'menu', 'menuitem', 'meter', 'modulelayout', 'templatestyle',
 			'moduleorder', 'moduletag', 'number', 'password', 'range', 'rules', 'tag', 'tel', 'text', 'textarea', 'timezone', 'url', 'user', 'usergroup'
 		),
 		'option' => array(
@@ -3694,7 +3694,7 @@ abstract class ComponentbuilderHelper
 			'note', 'spacer'
 		),
 		'special' => array(
-			'contentlanguage', 'moduleposition', 'plugin', 'repeatable', 'subform', 'templatestyle'
+			'contentlanguage', 'moduleposition', 'plugin', 'repeatable', 'subform'
 		)
 	);