From a9dae965a9af92a97a12e34fb4207e9f0bf02246 Mon Sep 17 00:00:00 2001 From: Paul Pound Date: Wed, 13 Aug 2014 15:41:42 -0300 Subject: [PATCH] formatted code and substituted site for apachesolr_search when checking for default search module --- targets/solr_site/theme/theme.inc | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/targets/solr_site/theme/theme.inc b/targets/solr_site/theme/theme.inc index 929808f..d094bc0 100755 --- a/targets/solr_site/theme/theme.inc +++ b/targets/solr_site/theme/theme.inc @@ -56,7 +56,15 @@ function roblib_search_solr_site_preprocessor(&$variables, $type) { $search_url = $base_url . '/roblib_search/solr_site/' . $type . '/' . $query; drupal_add_js(drupal_get_path('module', 'roblib_search_solr_site') . '/js/solr_site_' . $type . '.js'); $key = 'roblib_search_solr_site_' . $type; - $default_module = variable_get('search_default_module','node'); - drupal_add_js(array($key => array('search_url' => $search_url, 'search_query' => $query, - 'base_url' => $base_url, 'default_site_type' => $default_module)), array('type' => 'setting')); + $default_module = variable_get('search_default_module', 'site') == 'apachesolr_search' + ? 'site' : variable_get('search_default_module', 'site'); + + drupal_add_js(array( + $key => array( + 'search_url' => $search_url, + 'search_query' => $query, + 'base_url' => $base_url, + 'default_site_type' => $default_module + ) + ), array('type' => 'setting')); }