Version 5.0.13
This commit is contained in:
1 parent
b89858b2ff
commit
5efe744c5f
1407 files changed
+69690
-30177
No files matched your search
@@ -66,12 +66,19 @@ abstract class Query
|
||||
{
|
||||
if ( Settings::i()->search_method == 'elastic' )
|
||||
{
|
||||
return new Elastic\Query( $member ?: Member::loggedIn(), Url::external( rtrim( Settings::i()->search_elastic_server, '/' ) . '/' . Settings::i()->search_elastic_index ) );
|
||||
$search = new Elastic\Query( $member ?: Member::loggedIn(), Url::external( rtrim( Settings::i()->search_elastic_server, '/' ) . '/' . Settings::i()->search_elastic_index ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
return new Mysql\Query( $member ?: Member::loggedIn() );
|
||||
$search = new Mysql\Query( $member ?: Member::loggedIn() );
|
||||
}
|
||||
|
||||
/* Don't include any club content if we have disabled clubs */
|
||||
if( !Settings::i()->clubs )
|
||||
{
|
||||
$search->filterByClub( NULL );
|
||||
}
|
||||
return $search;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -99,9 +106,10 @@ abstract class Query
|
||||
{
|
||||
$this->setHiddenFilter( static::HIDDEN_VISIBLE );
|
||||
}
|
||||
|
||||
$filters = [];
|
||||
|
||||
/* Exclude disabled applications */
|
||||
$filters = array();
|
||||
foreach( SearchContent::searchableClasses() as $class )
|
||||
{
|
||||
/* We only want items here */
|
||||
|
||||
Reference in new issue
Block a user