Index: modules/taxonomy/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.418
diff -u -F^f -r1.418 taxonomy.module
--- modules/taxonomy/taxonomy.module	14 Apr 2008 17:48:42 -0000	1.418
+++ modules/taxonomy/taxonomy.module	15 Apr 2008 08:31:30 -0000
@@ -36,6 +36,35 @@ function taxonomy_theme() {
 }
 
 /**
+ * Implementation of hook_search
+ */
+function taxonomy_search($op = 'search', $keys = NULL) {
+  $results = NULL;
+  if (user_access('search content')) {
+    switch($op) {
+      case 'name':
+        $results = t('Tags');
+        break;
+      case 'search':
+        $keys = explode(' ', $keys);
+        foreach ($keys as $key) {
+          $matches = taxonomy_get_term_by_name($key);
+  
+          foreach ($matches as $match) {
+            $results[] = array (
+              'link' => url('taxonomy/term/' . $match->tid),
+              'title' => $match->name,
+              'snippet' => $match->description,
+            );
+          }
+        }
+        break;
+    }
+  }
+  return $results;
+}
+
+/**
  * Implementation of hook_link().
  *
  * This hook is extended with $type = 'taxonomy terms' to allow themes to