Changeset 5827 for trunk/src/includes/replies/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/replies/template.php (modified) (9 diffs)

trunk/src/includes/replies/template.php

@@ -109 +109 @@
  *                           others' replies
  * @uses WP_Query To make query and get the replies
- * @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
@@ -120 +120 @@
  */
 function bbp_has_replies( $args = array() ) {
-    global $wp_rewrite;
 
     /** Defaults **************************************************************/
@@ -226 +225 @@
 
         // If pretty permalinks are enabled, make our pagination pretty
-        if ( $wp_rewrite->using_permalinks() ) {
+        if ( bbp_use_pretty_urls() ) {
 
             // User's replies
@@ -245 +244 @@
             }
 
-            $base = trailingslashit( $base ) . user_trailingslashit( $wp_rewrite->pagination_base . '/%#%/' );
+            $base = trailingslashit( $base ) . user_trailingslashit( bbp_get_paged_slug() . '/%#%/' );
 
         // Unpretty permalinks
@@ -272 +271 @@
 
             // Remove first page from pagination
-            if ( $wp_rewrite->using_permalinks() ) {
-                $bbp->reply_query->pagination_links = str_replace( $wp_rewrite->pagination_base . '/1/', '', $bbp->reply_query->pagination_links );
+            if ( bbp_use_pretty_urls() ) {
+                $bbp->reply_query->pagination_links = str_replace( bbp_get_paged_slug() . '/1/', '', $bbp->reply_query->pagination_links );
             } else {
                 $bbp->reply_query->pagination_links = str_replace( '&paged=1', '', $bbp->reply_query->pagination_links );
@@ -474 +473 @@
      * @uses bbp_get_reply_position() To get the reply position
      * @uses get_option() To get the replies per page option
-     * @uses WP_Rewrite::using_permalinks() To check if the blog uses
-     *                                       permalinks
+     * @uses bbp_use_pretty_urls() To check if the site uses pretty URLs
      * @uses add_query_arg() To add custom args to the url
      * @uses apply_filters() Calls 'bbp_get_reply_url' with the reply url,
@@ -506 +504 @@
         // Include pagination
         } else {
-            global $wp_rewrite;
 
             // Pretty permalinks
-            if ( $wp_rewrite->using_permalinks() ) {
-                $url = trailingslashit( $topic_url ) . trailingslashit( $wp_rewrite->pagination_base ) . trailingslashit( $reply_page ) . $reply_hash;
+            if ( bbp_use_pretty_urls() ) {
+                $url = trailingslashit( $topic_url ) . trailingslashit( bbp_get_paged_slug() ) . trailingslashit( $reply_page ) . $reply_hash;
 
             // Yucky links
@@ -2022 +2019 @@
      */
     function bbp_get_reply_edit_url( $reply_id = 0 ) {
-        global $wp_rewrite;
 
         $reply = bbp_get_reply( $reply_id );
@@ -2032 +2028 @@
 
         // Pretty permalinks
-        if ( $wp_rewrite->using_permalinks() ) {
+        if ( bbp_use_pretty_urls() ) {
             $url = trailingslashit( $reply_link ) . bbp_get_edit_rewrite_id();
-            $url = trailingslashit( $url );
+            $url = user_trailingslashit( $url );
 
         // Unpretty permalinks
         } else {
-            $url = add_query_arg( array( bbp_get_reply_post_type() => $reply->post_name, bbp_get_edit_rewrite_id() => '1' ), $reply_link );
+            $url = add_query_arg( array(
+                bbp_get_reply_post_type() => $reply->post_name,
+                bbp_get_edit_rewrite_id() => '1'
+            ), $reply_link );
         }