From fb393ec782e76ad2412817c03d6c4a7efe60d933 Mon Sep 17 00:00:00 2001
From: aB0t <robot@vdm.io>
Date: Wed, 15 Feb 2023 02:46:55 +0200
Subject: [PATCH] update - v2.2.2

---
 componentbuilderheaderscompiler.php           | 27 ++++++++++---------
 componentbuilderheaderscompiler.xml           |  4 +--
 ...ension_componentbuilderheaderscompiler.ini |  2 +-
 ...on_componentbuilderheaderscompiler.sys.ini |  2 +-
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/componentbuilderheaderscompiler.php b/componentbuilderheaderscompiler.php
index 6ac6bf2..cdd484e 100644
--- a/componentbuilderheaderscompiler.php
+++ b/componentbuilderheaderscompiler.php
@@ -24,7 +24,7 @@ use VDM\Joomla\Componentbuilder\Compiler\Factory as CFactory;
  * Extension - Componentbuilder Headers Compiler plugin.
  *
  * @package   ComponentbuilderHeadersCompiler
- * @since     2.2.1
+ * @since     2.2.2
  */
 class PlgExtensionComponentbuilderHeadersCompiler extends CMSPlugin
 {
@@ -573,7 +573,19 @@ class PlgExtensionComponentbuilderHeadersCompiler extends CMSPlugin
 		if (isset($params[$get['field']]) || isset($params['power_' . $get['field']]))
 		{
 			// start little headers bucket
-			$headers = array();
+			$headers = [];
+
+			// load the headers if power
+			if (isset($params['power_' . $get['field']]) && ComponentbuilderHelper::checkArray($params['power_' . $get['field']], true)
+				&& ($powers = $this->getPowers($params['power_' . $get['field']])) !== false)
+			{
+				foreach ($powers as $power)
+				{
+					$power = trim($power);
+					$headers[$power] = $power;
+				}
+			}
+
 			// load the headers if text
 			if (isset($params[$get['field']]) && ComponentbuilderHelper::checkString($params[$get['field']]))
 			{
@@ -590,16 +602,7 @@ class PlgExtensionComponentbuilderHeadersCompiler extends CMSPlugin
 					}
 				}
 			}
-			// load the headers if power
-			if (isset($params['power_' . $get['field']]) && ComponentbuilderHelper::checkArray($params['power_' . $get['field']], true)
-				&& ($powers = $this->getPowers($params['power_' . $get['field']])) !== false)
-			{
-				foreach ($powers as $power)
-				{
-					$power = trim($power);
-					$headers[$power] = $power;
-				}
-			}
+
 			// check if we found some header values
 			if (ComponentbuilderHelper::checkArray($headers, true))
 			{
diff --git a/componentbuilderheaderscompiler.xml b/componentbuilderheaderscompiler.xml
index 8b63015..704e130 100644
--- a/componentbuilderheaderscompiler.xml
+++ b/componentbuilderheaderscompiler.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="plugin" version="4" group="extension" method="upgrade">
 	<name>PLG_EXTENSION_COMPONENTBUILDERHEADERSCOMPILER</name>
-	<creationDate>5th February, 2023</creationDate>
+	<creationDate>14th February, 2023</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>joomla@vdm.io</authorEmail>
 	<authorUrl>https://dev.vdm.io</authorUrl>
 	<copyright>Copyright (C) 2015 Vast Development Method. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>2.2.1</version>
+	<version>2.2.2</version>
 	<description>PLG_EXTENSION_COMPONENTBUILDERHEADERSCOMPILER_XML_DESCRIPTION</description>
 
 	<!-- Scripts to run on installation -->
diff --git a/language/en-GB/en-GB.plg_extension_componentbuilderheaderscompiler.ini b/language/en-GB/en-GB.plg_extension_componentbuilderheaderscompiler.ini
index d98af21..a94e2c8 100644
--- a/language/en-GB/en-GB.plg_extension_componentbuilderheaderscompiler.ini
+++ b/language/en-GB/en-GB.plg_extension_componentbuilderheaderscompiler.ini
@@ -2,6 +2,6 @@ PLG_EXTENSION_COMPONENTBUILDERHEADERSCOMPILER="Extension - Componentbuilder Head
 PLG_EXTENSION_COMPONENTBUILDERHEADERSCOMPILER_DESCRIPTION="This plugin is used to set the custom headers for your classes during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field.
 
 Also be sure to set your code where you would like to set Custom Headers."
-PLG_EXTENSION_COMPONENTBUILDERHEADERSCOMPILER_XML_DESCRIPTION="<h1>Extension - Componentbuilder Headers Compiler (v.2.2.1)</h1> <div style='clear: both;'></div><p>This plugin is used to set the custom headers for your classes during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field.
+PLG_EXTENSION_COMPONENTBUILDERHEADERSCOMPILER_XML_DESCRIPTION="<h1>Extension - Componentbuilder Headers Compiler (v.2.2.2)</h1> <div style='clear: both;'></div><p>This plugin is used to set the custom headers for your classes during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field.
 
 Also be sure to set your code where you would like to set Custom Headers.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 24th May, 2020</small></p>"
\ No newline at end of file
diff --git a/language/en-GB/en-GB.plg_extension_componentbuilderheaderscompiler.sys.ini b/language/en-GB/en-GB.plg_extension_componentbuilderheaderscompiler.sys.ini
index d98af21..a94e2c8 100644
--- a/language/en-GB/en-GB.plg_extension_componentbuilderheaderscompiler.sys.ini
+++ b/language/en-GB/en-GB.plg_extension_componentbuilderheaderscompiler.sys.ini
@@ -2,6 +2,6 @@ PLG_EXTENSION_COMPONENTBUILDERHEADERSCOMPILER="Extension - Componentbuilder Head
 PLG_EXTENSION_COMPONENTBUILDERHEADERSCOMPILER_DESCRIPTION="This plugin is used to set the custom headers for your classes during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field.
 
 Also be sure to set your code where you would like to set Custom Headers."
-PLG_EXTENSION_COMPONENTBUILDERHEADERSCOMPILER_XML_DESCRIPTION="<h1>Extension - Componentbuilder Headers Compiler (v.2.2.1)</h1> <div style='clear: both;'></div><p>This plugin is used to set the custom headers for your classes during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field.
+PLG_EXTENSION_COMPONENTBUILDERHEADERSCOMPILER_XML_DESCRIPTION="<h1>Extension - Componentbuilder Headers Compiler (v.2.2.2)</h1> <div style='clear: both;'></div><p>This plugin is used to set the custom headers for your classes during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field.
 
 Also be sure to set your code where you would like to set Custom Headers.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 24th May, 2020</small></p>"
\ No newline at end of file