Changeset 5827 for trunk/src/includes/search/template.php

Timestamp:

07/14/2015 12:31:42 AM (11 years ago)

Author:

johnjamesjacoby

Message:

Abstraction: Use bbp_db(), bbp_rewrite() & friends, introduced in r5823 & r5826.

This commit improves the stability of bbPress in the WordPress environment by reducing global variable exposure. It also comes with minimal opcode improvements in some circumstances where $GLOBALS is preferred over defining via global statements.

Some additional surrounding cleanup directly related to functions & methods being altered is also being performed here.

Fixes #2786.

File:

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

trunk/src/includes/search/template.php

@@ -31 +31 @@
  * @uses bbp_get_search_terms() To get the search terms
  * @uses WP_Query To make query and get the search results
- * @uses WP_Rewrite::using_permalinks() To check if the blog is using permalinks
+ * @uses bbp_use_pretty_urls() To check if the site is using pretty URLs
  * @uses bbp_get_search_url() To get the forum search url
  * @uses paginate_links() To paginate search results
@@ -40 +40 @@
  */
 function bbp_has_search_results( $args = array() ) {
-    global $wp_rewrite;
 
     /** Defaults **************************************************************/
@@ -115 +114 @@
 
         // If pretty permalinks are enabled, make our pagination pretty
-        if ( $wp_rewrite->using_permalinks() ) {
+        if ( bbp_use_pretty_urls() ) {
 
             // Shortcode territory
@@ -127 +126 @@
 
             // Add pagination base
-            $base = $base . user_trailingslashit( $wp_rewrite->pagination_base . '/%#%/' );
+            $base = $base . user_trailingslashit( bbp_get_paged_slug() . '/%#%/' );
 
         // Unpretty permalinks
@@ -154 +153 @@
 
         // Remove first page from pagination
-        if ( $wp_rewrite->using_permalinks() ) {
-            $bbp->search_query->pagination_links = str_replace( $wp_rewrite->pagination_base . '/1/', '', $bbp->search_query->pagination_links );
+        if ( bbp_use_pretty_urls() ) {
+            $bbp->search_query->pagination_links = str_replace( bbp_get_paged_slug() . '/1/', '', $bbp->search_query->pagination_links );
         } else {
             $bbp->search_query->pagination_links = str_replace( '&paged=1', '', $bbp->search_query->pagination_links );
@@ -264 +263 @@
      */
     function bbp_get_search_url() {
-        global $wp_rewrite;
 
         // Pretty permalinks
-        if ( $wp_rewrite->using_permalinks() ) {
-            $url = $wp_rewrite->root . bbp_get_search_slug();
-            $url = home_url( user_trailingslashit( $url ) );
+        if ( bbp_use_pretty_urls() ) {
+            $url = bbp_get_root_url() . bbp_get_search_slug();
+            $url = user_trailingslashit( $url );
+            $url = home_url( $url );
 
         // Unpretty permalinks
         } else {
-            $url = add_query_arg( array( bbp_get_search_rewrite_id() => '' ), home_url( '/' ) );
+            $url = add_query_arg( array(
+                bbp_get_search_rewrite_id() => ''
+            ), home_url( '/' ) );
         }
 
@@ -302 +303 @@
      */
     function bbp_get_search_results_url() {
-        global $wp_rewrite;
 
         // Get the search terms
@@ -308 +308 @@
 
         // Pretty permalinks
-        if ( $wp_rewrite->using_permalinks() ) {
+        if ( bbp_use_pretty_urls() ) {
 
             // Root search URL
-            $url = $wp_rewrite->root . bbp_get_search_slug();
+            $url = bbp_get_root_url() . bbp_get_search_slug();
 
             // Append search terms
             if ( ! empty( $search_terms ) ) {
-                $url = trailingslashit( $url ) . user_trailingslashit( urlencode( $search_terms ) );
+                $url = trailingslashit( $url ) . urlencode( $search_terms );
             }
 
             // Run through home_url()
-            $url = home_url( user_trailingslashit( $url ) );
+            $url = user_trailingslashit( $url );
+            $url = home_url( $url );
 
         // Unpretty permalinks
         } else {
-            $url = add_query_arg( array( bbp_get_search_rewrite_id() => urlencode( $search_terms ) ), home_url( '/' ) );
+            $url = add_query_arg( array(
+                bbp_get_search_rewrite_id() => urlencode( $search_terms )
+            ), home_url( '/' ) );
         }