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

Timestamp:

07/14/2015 12:31:42 AM (10 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/topics/template.php (modified) (13 diffs)

trunk/src/includes/topics/template.php

@@ -128 +128 @@
  * @uses bbp_get_super_stickies() To get the super stickies
  * @uses bbp_get_stickies() To get the forum stickies
- * @uses wpdb::get_results() To execute our query and get the 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 get_permalink() To get the permalink
  * @uses add_query_arg() To add custom args to the url
@@ -140 +139 @@
  */
 function bbp_has_topics( $args = array() ) {
-    global $wp_rewrite;
 
     /** Defaults **************************************************************/
@@ -354 +352 @@
 
         // If pretty permalinks are enabled, make our pagination pretty
-        if ( $wp_rewrite->using_permalinks() ) {
+        if ( bbp_use_pretty_urls() ) {
 
             // User's topics
@@ -398 +396 @@
 
             // Use pagination base
-            $base = trailingslashit( $base ) . user_trailingslashit( $wp_rewrite->pagination_base . '/%#%/' );
+            $base = trailingslashit( $base ) . user_trailingslashit( bbp_get_paged_slug() . '/%#%/' );
 
         // Unpretty pagination
@@ -420 +418 @@
 
         // Remove first page from pagination
-        $bbp->topic_query->pagination_links = str_replace( $wp_rewrite->pagination_base . "/1/'", "'", $bbp->topic_query->pagination_links );
+        $bbp->topic_query->pagination_links = str_replace( bbp_get_paged_slug() . "/1/'", "'", $bbp->topic_query->pagination_links );
     }
 
@@ -851 +849 @@
      *  - after: After the links
      * @uses bbp_get_topic_id() To get the topic id
-     * @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 user_trailingslashit() To add a trailing slash
      * @uses trailingslashit() To add a trailing slash
@@ -866 +863 @@
      */
     function bbp_get_topic_pagination( $args = array() ) {
-        global $wp_rewrite;
 
         // Bail if threading replies
@@ -881 +877 @@
 
         // If pretty permalinks are enabled, make our pagination pretty
-        if ( $wp_rewrite->using_permalinks() ) {
-            $base = trailingslashit( get_permalink( $r['topic_id'] ) ) . user_trailingslashit( $wp_rewrite->pagination_base . '/%#%/' );
+        if ( bbp_use_pretty_urls() ) {
+            $base = trailingslashit( get_permalink( $r['topic_id'] ) ) . user_trailingslashit( bbp_get_paged_slug() . '/%#%/' );
         } else {
             $base = add_query_arg( 'paged', '%#%', get_permalink( $r['topic_id'] ) );
@@ -910 +906 @@
 
             // Remove first page from pagination
-            if ( $wp_rewrite->using_permalinks() ) {
-                $pagination_links = str_replace( $wp_rewrite->pagination_base . '/1/', '', $pagination_links );
+            if ( bbp_use_pretty_urls() ) {
+                $pagination_links = str_replace( bbp_get_paged_slug() . '/1/', '', $pagination_links );
             } else {
                 $pagination_links = str_replace( '&paged=1', '', $pagination_links );
@@ -2640 +2636 @@
      */
     function bbp_get_topic_edit_url( $topic_id = 0 ) {
-        global $wp_rewrite;
 
         $topic = bbp_get_topic( $topic_id );
@@ -2651 +2646 @@
 
         // Pretty permalinks
-        if ( $wp_rewrite->using_permalinks() ) {
+        if ( bbp_use_pretty_urls() ) {
             $url = trailingslashit( $topic_link ) . bbp_get_edit_rewrite_id();
-            $url = trailingslashit( $url );
+            $url = user_trailingslashit( $url );
 
         // Unpretty permalinks
         } else {
-            $url = add_query_arg( array( bbp_get_topic_post_type() => $topic->post_name, bbp_get_edit_rewrite_id() => '1' ), $topic_link );
+            $url = add_query_arg( array(
+                bbp_get_topic_post_type() => $topic->post_name,
+                bbp_get_edit_rewrite_id() => '1'
+            ), $topic_link );
         }
 
@@ -3767 +3765 @@
      */
     function bbp_get_topic_tag_edit_link( $tag = '' ) {
-        global $wp_rewrite;
 
         // Get the term
@@ -3781 +3778 @@
 
             // Pretty
-            if ( $wp_rewrite->using_permalinks() ) {
+            if ( bbp_use_pretty_urls() ) {
                 $retval = user_trailingslashit( trailingslashit( bbp_get_topic_tag_link() ) . bbp_get_edit_rewrite_id() );