Merge pull request #6082 from alikon/patch-2

[#6054] - SQL Errors in search tag with MSSQL.

plugins/search/contacts/contacts.php

@@ -155,7 +155,6 @@ public function onContentSearch($text, $phrase = '', $ordering = '', $areas = nu
 					. ' OR a.fax LIKE ' . $text . ') AND a.published IN (' . implode(',', $state) . ') AND c.published=1 '
 					. ' AND a.access IN (' . $groups . ') AND c.access IN (' . $groups . ')'
 			)
-			->group('a.id, a.con_position, a.misc, c.alias, c.id')
 			->order($order);
 
 		// Filter by language.

plugins/search/content/content.php

@@ -178,7 +178,7 @@ public function onContentSearch($text, $phrase = '', $ordering = '', $areas = nu
 						. 'AND (a.publish_up = ' . $db->quote($nullDate) . ' OR a.publish_up <= ' . $db->quote($now) . ') '
 						. 'AND (a.publish_down = ' . $db->quote($nullDate) . ' OR a.publish_down >= ' . $db->quote($now) . ')'
 				)
-				->group('a.id, a.title, a.metadesc, a.metakey, a.created, a.introtext, a.fulltext, c.title, a.alias, c.alias, c.id')
+				->group('a.id, a.title, a.metadesc, a.metakey, a.created, a.language, a.catid, a.introtext, a.fulltext, c.title, a.alias, c.alias, c.id')
 				->order($order);
 
 			// Filter by language.

plugins/search/tags/tags.php

@@ -105,7 +105,7 @@ public function onContentSearch($text, $phrase = '', $ordering = '', $areas = nu
 		$query->select('a.id, a.title, a.alias, a.note, a.published, a.access' .
 			', a.checked_out, a.checked_out_time, a.created_user_id' .
 			', a.path, a.parent_id, a.level, a.lft, a.rgt' .
-			', a.language, a.created_time AS created, a.note, a.description');
+			', a.language, a.created_time AS created, a.description');
 
 		$case_when_item_alias = ' CASE WHEN ';
 		$case_when_item_alias .= $query->charLength('a.alias', '!=', '0');