Changeset 6467

Timestamp:

12/22/07 08:19:10 (8 months ago)

Author:

ryan

Message:

Throw pages into search queries. Let's see how they handle. see #5149

Files:

• trunk/wp-includes/query.php (modified) (4 diffs)

trunk/wp-includes/query.php

@@ -750 +750 @@
-        $groupby = '';
-
-
-
+
+
+
+
+
+
-        $post_type = $q['post_type'];
-        if ( !isset($q['posts_per_page']) || $q['posts_per_page'] == 0 )
@@ -886 +890 @@
-            if ($q['sentence']) {
-                $q['search_terms'] = array($q['s']);
-
-
+
-                preg_match_all('/".*?("|$)|((?<=[\\s",+])|^)[^\\s",+]+/', $q[s], $matches);
-                $q['search_terms'] = array_map(create_function('$a', 'return trim($a, "\\"\'\\n\\r ");'), $matches[0]);
@@ -898 +901 @@
-                $searchand = ' AND ';
-            }
-addslashes_gpc
+$wpdb->escape
-            if (!$q['sentence'] && count($q['search_terms']) > 1 && $q['search_terms'][0] != $q['s'] )
-                $search .= " OR (post_title LIKE '{$n}{$term}{$n}') OR (post_content LIKE '{$n}{$term}{$n}')";
@@ -1146 +1149 @@
-        } elseif ($this->is_single) {
-            $where .= " AND post_type = 'post'";
+        } elseif ( 'any' == $post_type ) {
+            $where .= '';
-        } else {
-            $where .= " AND post_type = '$post_type'";