Changeset 739

Timestamp:

01/08/2004 03:36:45 PM (22 years ago)

Author:

emc3

Message:

Fixed multi-word bug in search. Added conditional for no matches.

File:

• trunk/wp-blog-header.php (modified) (2 diffs)

trunk/wp-blog-header.php

@@ -129 +129 @@
     if (!$sentence) {
         $s_array = explode(' ',$s);
-        $search .= '((post_title LIKE \''.$n.$s_array[0].$n.'\') OR (post_content LIKE \''.$s_array[0].'\'))';
+        $search .= '((post_title LIKE \''.$n.$s_array[0].$n.'\') OR (post_content LIKE \''.$n.$s_array[0].$n.'\'))';
         for ( $i = 1; $i < count($s_array); $i = $i + 1) {
             $search .= ' AND ((post_title LIKE \''.$n.$s_array[$i].$n.'\') OR (post_content LIKE \''.$n.$s_array[$i].$n.'\'))';
@@ -321 +321 @@
 $posts = $wpdb->get_results($request);
 
-
-// Get the categories for all the posts
-foreach ($posts as $post) {
-    $post_id_list[] = $post->ID;
-}
-$post_id_list = implode(',', $post_id_list);
-
-$dogs = $wpdb->get_results("SELECT DISTINCT 
-    ID, category_id, cat_name, category_nicename, category_description 
-    FROM $tablecategories, $tablepost2cat, $tableposts 
-    WHERE category_id = cat_ID AND post_id = ID AND post_id IN ($post_id_list)");
-    
-foreach ($dogs as $catt) {
-    $category_cache[$catt->ID][] = $catt;
-}
-
-// Do the same for comment numbers
-
-
-if (1 == count($posts)) {
-    if ($p || $name) {
-        $more = 1;
-        $c = 1;
-        $single = 1;
-    }
-    if ($s) { // If they were doing a search and got one result
-        header('Location: ' . get_permalink($posts[0]->ID));
-    }
+// No point in doing all this work if we didn't match any posts.
+if ($posts) {
+    // Get the categories for all the posts
+    foreach ($posts as $post) {
+        $post_id_list[] = $post->ID;
+    }
+    $post_id_list = implode(',', $post_id_list);
+
+    $dogs = $wpdb->get_results("SELECT DISTINCT 
+        ID, category_id, cat_name, category_nicename, category_description 
+        FROM $tablecategories, $tablepost2cat, $tableposts 
+        WHERE category_id = cat_ID AND post_id = ID AND post_id IN ($post_id_list)");
+        
+    foreach ($dogs as $catt) {
+        $category_cache[$catt->ID][] = $catt;
+    }
+
+    // Do the same for comment numbers
+
+
+    if (1 == count($posts)) {
+        if ($p || $name) {
+            $more = 1;
+            $c = 1;
+            $single = 1;
+        }
+        if ($s) { // If they were doing a search and got one result
+            header('Location: ' . get_permalink($posts[0]->ID));
+        }
+}
 }
 ?>