bachir/popsu-d7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

security update core+modules

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2015-04-26 18:38:56 +02:00
parent 2f45ea820a
commit 7c96373038
1022 changed files with 30319 additions and 11259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
sites/all/modules/custom_search/includes/apachesolr_search.inc
View File

@@ -12,29 +12,22 @@
*
* To return:
* the complete search path
*
*/
function _custom_search_apachesolr_search($variables) {
// Set default path in case the core search page path isn't set yet.
$path = 'search/apachesolr_search';
$solr_info = apachesolr_search_page_load('core_search');
if (isset($solr_info['search_path'])) {
// Use the configured Solr search path instead of default path.
$path = $solr_info['search_path'];
}
$type = $path . '/' . $variables['keywords'];
function _custom_search_apachesolr_search($variables, &$keys, $fields) {
// Use the search info for the apachesolr module to get the search path.
$solr_info = apachesolr_search_search_info();
$type = 'search/' . $solr_info['path'] . '/' . $variables['keywords'];
$keys = array();
if (count($variables['types']) && !in_array('all', $variables['types'])) {
foreach ($variables['types'] as $t) {
$keys['f[' . count($keys) . ']'] = 'bundle:' . $t;
$keys['fq[' . count($keys) . ']'] = 'bundle:' . $t;
}
}
if (module_exists('taxonomy') && count($variables['terms'])) {
// get all fields info to get correct filter names
$fields = field_info_fields();
// Get all fields info to get correct filter names.
$taxonomy_fields = array();
foreach ($fields as $name => $settings) {
if ($settings['type'] == 'taxonomy_term_reference') {
@@ -42,12 +35,19 @@ function _custom_search_apachesolr_search($variables) {
$taxonomy_fields[$voc->vid] = $name;
}
}
// build keys for taxonomy
// Build keys for taxonomy.
foreach ($variables['terms'] as $t) {
$vocid = taxonomy_term_load($t)->vid;
$keys['f[' . count($keys) . ']'] = 'im_' . $taxonomy_fields[$vocid] . ':' . $t;
$keys['fq[' . count($keys) . ']'] = 'im_' . $taxonomy_fields[$vocid] . ':' . $t;
}
}
foreach (module_implements('custom_search_apachesolr_processing') as $module) {
$function = $module . '_custom_search_apachesolr_processing';
if (function_exists($function)) {
call_user_func_array($function, array(&$keys, $fields, $variables['other']));
}
}
return array('path' => $type, 'query' => $keys);
}
}