? .svn
? SolrPhpClient
? contrib/.svn
? contrib/apachesolr_image/.svn
? contrib/apachesolr_lang/.svn
? contrib/apachesolr_mlt/.svn
? contrib/apachesolr_multisitesearch/.svn
? contrib/apachesolr_nodeaccess/.svn
? contrib/apachesolr_og/.svn
? tests/.svn
Index: apachesolr_search.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/apachesolr_search.module,v
retrieving revision 1.1.2.6.2.111.4.7
diff -u -p -r1.1.2.6.2.111.4.7 apachesolr_search.module
--- apachesolr_search.module	23 Oct 2009 11:47:03 -0000	1.1.2.6.2.111.4.7
+++ apachesolr_search.module	9 Nov 2009 12:52:55 -0000
@@ -429,7 +429,7 @@ function apachesolr_process_response($re
       // Copy code from comment_nodeapi().
       $extra[] = format_plural($doc->comment_count, '1 comment', '@count comments');
       $results[] = array(
-        'link' => url($doc->path),
+        'link' => check_url($doc->url),
         'type' => apachesolr_search_get_type($doc->type),
         'title' => $doc->title,
         'user' => theme('username', $doc),
@@ -438,6 +438,7 @@ function apachesolr_process_response($re
         'extra' => $extra,
         'score' => $doc->score,
         'snippet' => $snippet,
+        'site' => parse_url($doc->url, PHP_URL_HOST),
       );
     }
 
@@ -620,7 +621,7 @@ function apachesolr_search_block($op = '
             }
           }
           $vid = substr($delta, 7);
-          $vocab = taxonomy_vocabulary_load($vid);
+          $vocab = taxonomy_get_vocabulary($vid);
           if (is_numeric($vid) && is_array($terms) && isset($terms[$vid]) && is_array($terms[$vid])) {
             ksort($terms[$vid]);
             $limit = isset($initial_limits['apachesolr_search'][$delta]) ? $initial_limits['apachesolr_search'][$delta] : $limit_default;