From bbee45ccab7b8e559de7bda69275ed41de130f8c Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Mon, 30 Nov 2020 19:25:45 +0200
Subject: [PATCH] Fixed the file naming colution for the new filters. gh-378
 Use the new select language string in filters.

---
 admin/compiler/SD.txt                       |  4 ++--
 admin/helpers/compiler/c_Fields.php         |  2 +-
 admin/helpers/compiler/e_Interpretation.php | 13 +++++++++----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/admin/compiler/SD.txt b/admin/compiler/SD.txt
index 0a97f920d..b48b1bc6c 100644
--- a/admin/compiler/SD.txt
+++ b/admin/compiler/SD.txt
@@ -16,7 +16,7 @@
 	@author			###AUTHOR### <###AUTHORWEBSITE###>###CONTRIBUTORS###	
 	@copyright		###COPYRIGHT###
 	@license		###LICENSE### 
-	
+
 	###SHORT_DESCRIPTION### 
-                                                             
+
 /----------------------------------------------------------------------------------------------------------------------------------*/
\ No newline at end of file
diff --git a/admin/helpers/compiler/c_Fields.php b/admin/helpers/compiler/c_Fields.php
index 6964a6b3f..c5cf40f05 100644
--- a/admin/helpers/compiler/c_Fields.php
+++ b/admin/helpers/compiler/c_Fields.php
@@ -5038,7 +5038,7 @@ class Fields extends Structure
 		{
 			// this pains me... but to avoid collusion
 			$filter_type_code     = ComponentbuilderHelper::safeString(
-				$name . $field['filter'] . $typeName
+				 $nameListCode . 'filter' . $name
 			);
 			$filter_type_code     = preg_replace('/_+/', '', $filter_type_code);
 			$filter_function_name = ComponentbuilderHelper::safeString(
diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php
index fd2fbb62e..46d9d0e98 100644
--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@@ -17660,9 +17660,14 @@ class Interpretation extends Fields
 							. "protected function getThe" . $filter['function']
 							. "Selections()";
 						$function[] = $this->_t(1) . "{";
+						$function[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
+							. " Get a db connection.";
+					}
+					else
+					{
+						$function[] = "//" . $this->setLine(__LINE__)
+							. " Get a db connection.";
 					}
-					$function[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
-						. " Get a db connection.";
 					$function[] = $this->_t(2) . "\$db = JFactory::getDbo();";
 					$function[] = PHP_EOL . $this->_t(2) . "//"
 						. $this->setLine(__LINE__)
@@ -17751,8 +17756,8 @@ class Interpretation extends Fields
 					if (!$funtion_path && $filter['multi'] == 1)
 					{
 						$function[] = $this->_t(3)
-							. "\$_filter[] = JHtml::_('select.option', '', '- Select ' . JText:"
-							. ":_('" . $filter['lang'] . "') . ' -');";
+							. "\$_filter[] = JHtml::_('select.option', '', '- ' . JText:"
+							. ":_('" . $filter['lang_select'] . "') . ' -');";
 					}
 					$function[] = $this->_t(3) . "foreach (\$results as \$"
 						. $filter['code'] . ")";