Index: modules/search/search.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.module,v
retrieving revision 1.250
diff -u -p -r1.250 search.module
--- modules/search/search.module	8 Jan 2008 10:35:42 -0000	1.250
+++ modules/search/search.module	21 Jan 2008 00:39:13 -0000
@@ -499,10 +499,17 @@ function search_index($sid, $type, $text
               $linknid = $match[1];
               if ($linknid > 0) {
                 // Note: ignore links to uncachable nodes to avoid redirect bugs.
-                $node = db_fetch_object(db_query('SELECT n.title, n.nid, n.vid, r.format FROM {node} n INNER JOIN {node_revisions} r ON n.vid = r.vid WHERE n.nid = %d', $linknid));
-                if (filter_format_allowcache($node->format)) {
+                $node = db_fetch_object(db_query('SELECT n.title, r.format FROM {node} n INNER JOIN {node_revisions} r ON n.vid = r.vid WHERE n.nid = %d', $linknid));
+                if ($node) {
+                  if (filter_format_allowcache($node->format)) {
+                    $link = TRUE;
+                    $linktitle = $node->title;
+                  }
+                }
+                // If the node doesn't exist yet, use the node ID as the title.
+                else {
                   $link = TRUE;
-                  $linktitle = $node->title;
+                  $linktitle = $linknid;
                 }
               }
             }