Changeset 9714 for trunk/wp-includes/query.php

Timestamp:

11/15/2008 05:56:44 PM (17 years ago)

Author:

ryan

Message:

Notice fixes. Props DD32. see #7509

File:

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

trunk/wp-includes/query.php

@@ -1741 +1741 @@
             // added slashes screw with quote grouping when done early, so done later
             $q['s'] = stripslashes($q['s']);
-            if ($q['sentence']) {
+            if ( !empty($q['sentence']) ) {
                 $q['search_terms'] = array($q['s']);
             } else {
-                preg_match_all('/".*?("|$)|((?<=[\\s",+])|^)[^\\s",+]+/', $q[s], $matches);
+                preg_match_all('/".*?("|$)|((?<=[\\s",+])|^)[^\\s",+]+/', $q['s'], $matches);
                 $q['search_terms'] = array_map(create_function('$a', 'return trim($a, "\\"\'\\n\\r ");'), $matches[0]);
             }
-            $n = ($q['exact']) ? '' : '%';
+            $n = !empty($q['exact']) ? '' : '%';
             $searchand = '';
             foreach( (array) $q['search_terms'] as $term) {
@@ -1755 +1755 @@
             }
             $term = $wpdb->escape($q['s']);
-            if (!$q['sentence'] && count($q['search_terms']) > 1 && $q['search_terms'][0] != $q['s'] )
+            if (empty($q['sentence']) && count($q['search_terms']) > 1 && $q['search_terms'][0] != $q['s'] )
                 $search .= " OR ($wpdb->posts.post_title LIKE '{$n}{$term}{$n}') OR ($wpdb->posts.post_content LIKE '{$n}{$term}{$n}')";