Version 4.7.23

system/Content/Search/Elastic/Query.php

@@ -1107,7 +1107,7 @@ class _Query extends \IPS\Content\Search\Query
 		$filters = $this->filters;
 		
 		/* Set our conditions for this search */
-		if ( $term !== NULL or $tags !== NULL )
+		if ( $term !== NULL or ( \IPS\Settings::i()->tags_enabled AND $tags !== NULL ) )
 		{
 			$searchConditions = array();
 			$titleField = \IPS\Settings::i()->search_title_boost ? ( 'index_title^' . \intval( \IPS\Settings::i()->search_title_boost ) ) : 'index_title';
@@ -1165,7 +1165,7 @@ class _Query extends \IPS\Content\Search\Query
 				}
 			}
 			/* Build the condition for the tags */
-			if ( $tags !== NULL )
+			if ( \IPS\Settings::i()->tags_enabled and $tags !== NULL )
 			{
 				$searchConditions[] = array(
 					'bool' => array(