Version 4.3.6
This commit is contained in:
1 parent
fe1acf984a
commit
1a0c7fd3c2
609 files changed
+14707
-5726
No files matched your search
@@ -94,7 +94,7 @@ class _Query extends \IPS\Content\Search\Query
|
||||
foreach ( $contentFilters as $filter )
|
||||
{
|
||||
$clause = array();
|
||||
if ( $type )
|
||||
if ( $type and $filter->itemClass )
|
||||
{
|
||||
$this->itemClasses[] = $filter->itemClass;
|
||||
}
|
||||
@@ -116,16 +116,19 @@ class _Query extends \IPS\Content\Search\Query
|
||||
$clause[] = \IPS\Db::i()->in( 'index_container_id', $filter->containerIds, $filter->containerIdFilter === FALSE );
|
||||
}
|
||||
|
||||
$itemClass = $filter->itemClass;
|
||||
if ( isset( $itemClass::$containerNodeClass ) )
|
||||
if ( $filter->itemClass )
|
||||
{
|
||||
$containerClass = $itemClass::$containerNodeClass;
|
||||
$unsearchableIds = $containerClass::unsearchableNodeIds();
|
||||
|
||||
if ( $unsearchableIds != NULL )
|
||||
$itemClass = $filter->itemClass;
|
||||
if ( isset( $itemClass::$containerNodeClass ) )
|
||||
{
|
||||
$clause[] = \IPS\Db::i()->in( 'index_container_id', $unsearchableIds, TRUE );
|
||||
}
|
||||
$containerClass = $itemClass::$containerNodeClass;
|
||||
$unsearchableIds = $containerClass::unsearchableNodeIds();
|
||||
|
||||
if ( $unsearchableIds != NULL )
|
||||
{
|
||||
$clause[] = \IPS\Db::i()->in( 'index_container_id', $unsearchableIds, TRUE );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Are we excluding certain container classes? */
|
||||
|
||||
Reference in new issue
Block a user