Changeset 4579 for trunk/bbpress.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/bbpress.php (modified) (8 diffs)

trunk/bbpress.php

@@ -181 +181 @@
         /** Versions **********************************************************/
 
-        $this->version    = '2.3-bleeding-4514';
+        $this->version    = '2.3-bleeding-4579';
         $this->db_version = '220';
 
@@ -222 +222 @@
 
         // Other identifiers
-        $this->user_id           = apply_filters( 'bbp_user_id', 'bbp_user' );
-        $this->tops_id           = apply_filters( 'bbp_tops_id', 'bbp_tops' );
-        $this->reps_id           = apply_filters( 'bbp_reps_id', 'bbp_reps' );
-        $this->favs_id           = apply_filters( 'bbp_favs_id', 'bbp_favs' );
-        $this->subs_id           = apply_filters( 'bbp_subs_id', 'bbp_subs' );
-        $this->view_id           = apply_filters( 'bbp_view_id', 'bbp_view' );
-        $this->edit_id           = apply_filters( 'bbp_edit_id', 'edit'     );
+        $this->user_id           = apply_filters( 'bbp_user_id',   'bbp_user'   );
+        $this->tops_id           = apply_filters( 'bbp_tops_id',   'bbp_tops'   );
+        $this->reps_id           = apply_filters( 'bbp_reps_id',   'bbp_reps'   );
+        $this->favs_id           = apply_filters( 'bbp_favs_id',   'bbp_favs'   );
+        $this->subs_id           = apply_filters( 'bbp_subs_id',   'bbp_subs'   );
+        $this->view_id           = apply_filters( 'bbp_view_id',   'bbp_view'   );
+        $this->search_id         = apply_filters( 'bbp_search_id', 'bbp_search' );
+        $this->edit_id           = apply_filters( 'bbp_edit_id',   'edit'       );
 
         /** Queries ***********************************************************/
@@ -240 +241 @@
         $this->topic_query    = new stdClass(); // Main topic query
         $this->reply_query    = new stdClass(); // Main reply query
+        $this->search_query   = new stdClass(); // Main search query
 
         /** Theme Compat ******************************************************/
@@ -309 +311 @@
         require( $this->includes_dir . 'replies/functions.php'     );
         require( $this->includes_dir . 'replies/template-tags.php' );
+
+        // Search
+        require( $this->includes_dir . 'search/functions.php'      );
+        require( $this->includes_dir . 'search/template-tags.php'  );
 
         // Users
@@ -359 +365 @@
             'register_theme_packages',  // Register bundled theme packages (bbp-theme-compat/bbp-themes)
             'load_textdomain',          // Load textdomain (bbpress)
-            'add_rewrite_tags',         // Add rewrite tags (view|user|edit)
-            'generate_rewrite_rules'    // Generate rewrite rules (view|edit)
+            'add_rewrite_tags',         // Add rewrite tags (view|user|edit|search)
+            'generate_rewrite_rules'    // Generate rewrite rules (view|edit|search)
         );
 
@@ -833 +839 @@
         add_rewrite_tag( '%%' . bbp_get_view_rewrite_id()               . '%%', '([^/]+)'   ); // View Page tag
         add_rewrite_tag( '%%' . bbp_get_edit_rewrite_id()               . '%%', '([1]{1,})' ); // Edit Page tag
+        add_rewrite_tag( '%%' . bbp_get_search_rewrite_id()             . '%%', '([^/]+)'   ); // Search Results tag
         add_rewrite_tag( '%%' . bbp_get_user_rewrite_id()               . '%%', '([^/]+)'   ); // User Profile tag
         add_rewrite_tag( '%%' . bbp_get_user_favorites_rewrite_id()     . '%%', '([1]{1,})' ); // User Favorites tag
@@ -854 +861 @@
 
         // Slugs
-        $view_slug = bbp_get_view_slug();
-        $user_slug = bbp_get_user_slug();
+        $view_slug   = bbp_get_view_slug();
+        $search_slug = bbp_get_search_slug();
+        $user_slug   = bbp_get_user_slug();
 
         // Unique rewrite ID's
-        $edit_id = bbp_get_edit_rewrite_id();
-        $view_id = bbp_get_view_rewrite_id();
-        $user_id = bbp_get_user_rewrite_id();
-        $favs_id = bbp_get_user_favorites_rewrite_id();
-        $subs_id = bbp_get_user_subscriptions_rewrite_id();
-        $tops_id = bbp_get_user_topics_rewrite_id();
-        $reps_id = bbp_get_user_replies_rewrite_id();
+        $edit_id     = bbp_get_edit_rewrite_id();
+        $view_id     = bbp_get_view_rewrite_id();
+        $search_id   = bbp_get_search_rewrite_id();
+        $user_id     = bbp_get_user_rewrite_id();
+        $favs_id     = bbp_get_user_favorites_rewrite_id();
+        $subs_id     = bbp_get_user_subscriptions_rewrite_id();
+        $tops_id     = bbp_get_user_topics_rewrite_id();
+        $reps_id     = bbp_get_user_replies_rewrite_id();
 
         // Rewrite rule matches used repeatedly below
-        $root_rule = '/([^/]+)/?$';
-        $edit_rule = '/([^/]+)/edit/?$';
-        $feed_rule = '/([^/]+)/feed/?$';
-        $page_rule = '/([^/]+)/page/?([0-9]{1,})/?$';
+        $root_rule   = '/([^/]+)/?$';
+        $edit_rule   = '/([^/]+)/edit/?$';
+        $feed_rule   = '/([^/]+)/feed/?$';
+        $page_rule   = '/([^/]+)/page/?([0-9]{1,})/?$';
+
+        // Search rules (without slug check)
+        $search_root_rule = '/?$';
+        $search_page_rule = '/page/?([0-9]{1,})/?$';
 
         // User profile rules
@@ -908 +921 @@
             $view_slug . $feed_rule => 'index.php?' . $view_id . '=' . $wp_rewrite->preg_index( 1 ) . '&feed='  . $wp_rewrite->preg_index( 2 ),
             $view_slug . $root_rule => 'index.php?' . $view_id . '=' . $wp_rewrite->preg_index( 1 ),
+
+            // Search All
+            $search_slug . $search_page_rule => 'index.php?&paged=' . $wp_rewrite->preg_index( 1 ),
+            $search_slug . $search_root_rule => 'index.php?',
         );