From 663f8405e5fcef12972d868c6c154c38237c8b57 Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Sat, 29 Jun 2019 23:11:37 +0200
Subject: [PATCH] Fixed gh-433 to allow ->value in the Value Key field on the
 where subform in the Tweak tab of the dynamicGet view.

---
 README.md                              | 2 +-
 admin/README.txt                       | 2 +-
 admin/helpers/compiler/a_Get.php       | 2 +-
 admin/helpers/compiler/b_Structure.php | 4 ++--
 admin/helpers/compiler/f_Infusion.php  | 1 -
 admin/models/forms/dynamic_get.xml     | 2 +-
 componentbuilder.xml                   | 2 +-
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 53a4587a1..3623fb829 100644
--- a/README.md
+++ b/README.md
@@ -146,7 +146,7 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 22nd June, 2019
++ *Last Build*: 29th June, 2019
 + *Version*: 2.9.20
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/admin/README.txt b/admin/README.txt
index 53a4587a1..3623fb829 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -146,7 +146,7 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 22nd June, 2019
++ *Last Build*: 29th June, 2019
 + *Version*: 2.9.20
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php
index d257f2aac..0ee7b871d 100644
--- a/admin/helpers/compiler/a_Get.php
+++ b/admin/helpers/compiler/a_Get.php
@@ -905,7 +905,7 @@ class Get
 			// Get the dispatcher.
 			$dispatcher = \JEventDispatcher::getInstance();
 
-			// Trigger the form preparation event.
+			// Trigger this compiler event.
 			$results = $dispatcher->trigger($event, $data);
 
 			// Check for errors encountered while trigger the event
diff --git a/admin/helpers/compiler/b_Structure.php b/admin/helpers/compiler/b_Structure.php
index 71752637d..aeceafb9a 100644
--- a/admin/helpers/compiler/b_Structure.php
+++ b/admin/helpers/compiler/b_Structure.php
@@ -19,14 +19,14 @@ class Structure extends Get
 {
 
 	/**
-	 * The foulder counter
+	 * The folder counter
 	 * 
 	 * @var     int
 	 */
 	public $folderCount = 0;
 
 	/**
-	 * The foulder counter
+	 * The file counter
 	 * 
 	 * @var     int
 	 */
diff --git a/admin/helpers/compiler/f_Infusion.php b/admin/helpers/compiler/f_Infusion.php
index 869cecd18..5457043a5 100644
--- a/admin/helpers/compiler/f_Infusion.php
+++ b/admin/helpers/compiler/f_Infusion.php
@@ -847,7 +847,6 @@ class Infusion extends Interpretation
 			if (isset($this->componentData->site_views) && ComponentbuilderHelper::checkArray($this->componentData->site_views))
 			{
 				$this->target = 'site';
-				// var_dump($this->componentData->site_views);exit;
 				// start dynamic build
 				foreach ($this->componentData->site_views as $view)
 				{
diff --git a/admin/models/forms/dynamic_get.xml b/admin/models/forms/dynamic_get.xml
index b82c8dc0e..3edb290cd 100644
--- a/admin/models/forms/dynamic_get.xml
+++ b/admin/models/forms/dynamic_get.xml
@@ -1162,7 +1162,7 @@
 					readonly="false"
 					disabled="false"
 					required="true"
-					filter="CMD"
+					filter="STRING"
 					message="COM_COMPONENTBUILDER_DYNAMIC_GET_VALUE_KEY_MESSAGE"
 					hint="COM_COMPONENTBUILDER_DYNAMIC_GET_VALUE_KEY_HINT"
 				/>
diff --git a/componentbuilder.xml b/componentbuilder.xml
index 977f90557..0bb88511e 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>22nd June, 2019</creationDate>
+	<creationDate>29th June, 2019</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>