Version 5.0.13

system/Content/Search/Mysql/Query.php

@@ -22,6 +22,7 @@ use IPS\Db\Exception;
 use IPS\Db\Select;
 use IPS\Member;
 use IPS\Member\Club;
+use IPS\Node\Grouping;
 use IPS\Settings;
 use IPS\IPS;
 use Throwable;
@@ -33,6 +34,7 @@ use function in_array;
 use function intval;
 use function is_array;
 use function is_null;
+use function is_string;
 use const IPS\CIC;
 use const IPS\USE_MYSQL_SEARCH_OPTIMIZED_MODE;
 
@@ -145,10 +147,23 @@ class Query extends \IPS\Content\Search\Query
 				$clause[] = 'index_class=?';
 				$params[] = array_pop( $filter->classes );
 			}
-			
+
 			/* Set the containers */
 			if ( $filter->containerIdFilter !== NULL )
 			{
+				if ( $filter->containerIds )
+				{
+					if ( $filter->itemClass )
+					{
+						$itemClass = $filter->itemClass;
+						if ( isset( $itemClass::$containerNodeClass ) )
+						{
+							$containerClass = $itemClass::$containerNodeClass;
+							$filter->containerIds = $containerClass::normalizeIds( $filter->containerIds );
+						}
+					}
+				}
+
 				$clause[] = Db::i()->in( 'index_container_id', $filter->containerIds, $filter->containerIdFilter === FALSE );
 			}