Changeset 5162

Timestamp:

11/23/2013 09:23:49 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Allow 'bbp_has_search_results' filter to still run even if no search terms were passed. This brings it inline with other component queries. Fixes #2356.

File:

• trunk/includes/search/template.php (modified) (2 diffs)

trunk/includes/search/template.php

@@ -86 +86 @@
     $r = bbp_parse_args( $args, $default, 'has_search_results' );
 
-    // Don't bother if we don't have search terms
-    if ( empty( $r['s'] ) )
-        return false;
-
     // Get bbPress
     $bbp = bbpress();
 
     // Call the query
-    $bbp->search_query = new WP_Query( $r );
+    if ( ! empty( $r['s'] ) ) {
+        $bbp->search_query = new WP_Query( $r );
+    }
 
     // Add pagination values to query object
@@ -103 +101 @@
     $bbp->search_query->is_home        = false;
 
-    // Found posts
-    if ( !$bbp->search_query->found_posts )
-        return false;
-
     // Only add pagination is query returned results
-    if ( (int) $bbp->search_query->found_posts && (int) $bbp->search_query->posts_per_page ) {
+    if ( ! empty( $bbp->search_query->found_posts ) && ! empty( $bbp->search_query->posts_per_page ) ) {
 
         // Array of arguments to add after pagination links