|
@@ -187,9 +187,11 @@ function materio_search_api_results_search(){
|
|
|
|
|
|
// $index_machine_name = variable_get('brevessearchindex_'.$language->language, -1);
|
|
// $index_machine_name = variable_get('brevessearchindex_'.$language->language, -1);
|
|
// dsm($index_machine_name, '$index_machine_name');
|
|
// dsm($index_machine_name, '$index_machine_name');
|
|
-
|
|
|
|
- $indexed_bundles = $index->options['data_alter_callbacks']['search_api_alter_bundle_filter']['settings']['bundles'];
|
|
|
|
- foreach ($indexed_bundles as $bundle) { $default_bundles[] = $bundle; }
|
|
|
|
|
|
+ $default_bundles = array();
|
|
|
|
+ if(isset($index->options['data_alter_callbacks']['search_api_alter_bundle_filter']['settings']['bundles'])){
|
|
|
|
+ $indexed_bundles = $index->options['data_alter_callbacks']['search_api_alter_bundle_filter']['settings']['bundles'];
|
|
|
|
+ foreach ($indexed_bundles as $bundle) { $default_bundles[] = $bundle; }
|
|
|
|
+ }
|
|
|
|
|
|
$bundles_filter = isset($user->data['materiosearchapi_bundlesfilter']) ? $user->data['materiosearchapi_bundlesfilter'] : $default_bundles;
|
|
$bundles_filter = isset($user->data['materiosearchapi_bundlesfilter']) ? $user->data['materiosearchapi_bundlesfilter'] : $default_bundles;
|
|
// dsm($bundles_filter, 'bundles_filter');
|
|
// dsm($bundles_filter, 'bundles_filter');
|
|
@@ -207,12 +209,14 @@ function materio_search_api_results_search(){
|
|
->keys(implode(' ', $keys))
|
|
->keys(implode(' ', $keys))
|
|
->range($offset, $limit);
|
|
->range($offset, $limit);
|
|
|
|
|
|
- $filter = $query->createFilter('OR');
|
|
|
|
- foreach ($bundles_filter as $type) {
|
|
|
|
- $filter->condition('type', $type, '=');
|
|
|
|
|
|
+ if(count($bundles_filter)){
|
|
|
|
+ $filter = $query->createFilter('OR');
|
|
|
|
+ foreach ($bundles_filter as $type) {
|
|
|
|
+ $filter->condition('type', $type, '=');
|
|
|
|
+ }
|
|
|
|
+ // dsm($filter, 'filter');
|
|
|
|
+ $query->filter($filter);
|
|
}
|
|
}
|
|
- // dsm($filter, 'filter');
|
|
|
|
- $query->filter($filter);
|
|
|
|
|
|
|
|
// $query->setOption('search_api_bypass_access', true);
|
|
// $query->setOption('search_api_bypass_access', true);
|
|
$query->setOption('search_api_access_account', $user);
|
|
$query->setOption('search_api_access_account', $user);
|