Merge branch '4.0-dev' into group-toobar-buttons-stages-transitions

components/com_finder/Model/SearchModel.php

@@ -171,13 +171,15 @@ protected function getListQuery()
 		{
 			// Convert the associative array to a numerically indexed array.
 			$groups = array_values($this->searchquery->filters);
+			$taxonomies = call_user_func_array('array_merge', array_values($this->searchquery->filters));
 
-			// Iterate through each taxonomy group and add the join and where.
+			$query->join('INNER', $db->quoteName('#__finder_taxonomy_map') . ' AS t ON t.link_id = l.link_id')
+				->where('t.node_id IN (' . implode(',', array_unique($taxonomies)) . ')');
+
+			// Iterate through each taxonomy group.
 			for ($i = 0, $c = count($groups); $i < $c; $i++)
 			{
-				// We use the offset because each join needs a unique alias.
-				$query->join('INNER', $db->quoteName('#__finder_taxonomy_map') . ' AS t' . $i . ' ON t' . $i . '.link_id = l.link_id')
-					->where('t' . $i . '.node_id IN (' . implode(',', $groups[$i]) . ')');
+				$query->having('SUM(t.node_id IN (' . implode(',', $groups[$i]) . ')) > 0');
 			}
 		}
 
@@ -283,6 +285,7 @@ protected function getListQuery()
 			// Since we need to return a query, we simplify this one.
 			$query->clear('join')
 				->clear('where')
+				->clear('having')
 				->clear('group')
 				->where('false');
 
@@ -308,13 +311,16 @@ protected function getListQuery()
 		 */
 		if (count($this->requiredTerms))
 		{
-			$i = 0;
-
 			foreach ($this->requiredTerms as $terms)
 			{
-				$query->join('INNER', $this->_db->quoteName('#__finder_links_terms') . ' AS r' . $i . ' ON r' . $i . '.link_id = l.link_id')
-					->where('r' . $i . '.term_id IN (' . implode(',', $terms) . ')');
-				$i++;
+				if (count($terms))
+				{
+					$query->having('SUM(m.term_id IN (' . implode(',', $terms) . ')) > 0');
+				}
+				else
+				{
+					$query->where('false');
+				}
 			}
 		}