Fix (?) for table alias in CDD autocompete_where.

Fabrik · Feb 21, 2015 · 45df772 · 45df772 · jpsoigne · Mar 27, 2015
1 parent e5bec85
commit 45df772
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/plugins/fabrik_element/databasejoin/databasejoin.php b/plugins/fabrik_element/databasejoin/databasejoin.php
@@ -2912,29 +2912,28 @@ public static function cacheAutoCompleteOptions($elementModel, $search, $opts =
 
 		if (!strstr($c, 'CONCAT'))
 		{
+			if (!strstr($c, '.'))
+			{
+				$join = $elementModel->getJoin();
+				$joinTable = $join->table_join_alias;
+				$c = $joinTable.'.'.$c
+			}
 			$c = FabrikString::safeColName($c);
 		}
 
 		$filterMethod = $elementModel->getFilterBuildMethod();
 
 		if ($filterMethod == 1)
 		{
-			$join = $elementModel->getJoin();
-			$joinTable = $join->table_join_alias;			$opts = array();
-
-			if (!strstr($c, 'CONCAT'))
-			{
-				$opts['label'] = strstr($c, '.') ? $c : $joinTable . '.' . $c;
-			}
-			else
-			{
-				$opts['label'] = $c;
-			}
+			$opts = array();
+			$opts['label'] = $c;
 
 			return parent::cacheAutoCompleteOptions($elementModel, $search, $opts);
 		}
+
 		// $$$ hugh - added 'autocomplete_how', currently just "starts_with" or "contains"
 		// default to "contains" for backward compat.
+
 		if ($params->get('dbjoin_autocomplete_how', 'contains') == 'contains')
 		{
 			$elementModel->_autocomplete_where = $c . ' LIKE ' . $db->quote('%' . $search . '%');