--- ../vendor/modules/node.module	2006-05-14 16:57:58.000000000 -0700
+++ modules/node.module	2006-06-14 14:26:02.000000000 -0700
@@ -699,6 +699,11 @@
       // Do search
       $find = do_search($keys, 'node', 'INNER JOIN {node} n ON n.nid = i.sid '. $join1 .' INNER JOIN {users} u ON n.uid = u.uid', $conditions1 . (empty($where1) ? '' : ' AND '. $where1), $arguments1, $select2, $join2, $arguments2);
 
+      $query = NULL;
+      if ($find && module_exist('highlight') && preg_match_all('/(?:^| )(?:"(.*?)"|(?!OR )([^-"]\S*))(?= |$)/i', $keys, $matches)) {
+        $query = 'highlight=' . urlencode(implode(',', preg_grep('/./', array_merge($matches[1], $matches[2]))));
+      }
+
       // Load results
       $results = array();
       foreach ($find as $item) {
@@ -720,7 +725,7 @@
         $node->body .= module_invoke('taxonomy', 'nodeapi', $node, 'update index');
 
         $extra = node_invoke_nodeapi($node, 'search result');
-        $results[] = array('link' => url('node/'. $item->sid),
+        $results[] = array('link' => url('node/'. $item->sid, $query),
                            'type' => node_get_name($node),
                            'title' => $node->title,
                            'user' => theme('username', $node),