Changeset 4579 for trunk/includes/common/shortcodes.php

Timestamp:

12/16/2012 08:19:21 AM (13 years ago)

Author:

jmdodd

Message:

Introduce dedicated forum search.

• Search forums, topics, and replies.
• Add new search functions, including bbp_has_search_results().
• Provide templates for search results.
• Fixes #1575.

File:

• trunk/includes/common/shortcodes.php (modified) (3 diffs)

trunk/includes/common/shortcodes.php

@@ -80 +80 @@
             'bbp-single-view'      => array( $this, 'display_view'          ), // Single view
 
+            /** Search ********************************************************/
+
+            'bbp-search'           => array( $this, 'display_search'        ), // Search
+
             /** Account *******************************************************/
 
@@ -115 +119 @@
 
         // Unset global queries
-        $bbp->forum_query = new stdClass;
-        $bbp->topic_query = new stdClass;
-        $bbp->reply_query = new stdClass;
+        $bbp->forum_query  = new stdClass;
+        $bbp->topic_query  = new stdClass;
+        $bbp->reply_query  = new stdClass;
+        $bbp->search_query = new stdClass;
 
         // Unset global ID's
@@ -603 +608 @@
     }
 
+    /** Search ****************************************************************/
+
+    /**
+     * Display the contents of search results in an output buffer and return to
+     * ensure that post/page contents are displayed first.
+     *
+     * @since bbPress (r4579)
+     *
+     * @param array $attr
+     * @param string $content
+     * @uses bbp_search_query()
+     * @uses get_template_part()
+     */
+    public function display_search( $attr, $content = '' ) {
+
+        // Set passed attribute to $search_terms for clarity
+        $search_terms = $attr['search'];
+
+        // Start output buffer
+        $this->start( 'bbp_search' );
+
+        // Unset globals
+        $this->unset_globals();
+
+        // Load the search
+        bbp_search_query( array( 's' => $search_terms ) );
+
+        // Output template
+        bbp_get_template_part( 'content', 'search' );
+
+        // Return contents of output buffer
+        return $this->end();
+    }
+
     /** Account ***************************************************************/