Changeset 3505 for branches/plugin/bbp-includes/bbp-reply-template.php

Timestamp:

09/10/2011 10:27:19 PM (13 years ago)

Author:

johnjamesjacoby

Message:

API adjustments:

• Refactor _status_ vars into callable functions.
• Audit usage of $bbp global.
• Perform get_class() checks on extensions to avoid errors if global $bbp is overloaded.
• Bump DB version to 175.

File:

• branches/plugin/bbp-includes/bbp-reply-template.php (modified) (9 diffs)

branches/plugin/bbp-includes/bbp-reply-template.php

@@ -70 +70 @@
 
     // Default status
-    $default_status = join( ',', array( 'publish', $bbp->closed_status_id ) );
+    $default_status = join( ',', array( bbp_get_public_status_id(), bbp_get_closed_status_id() ) );
 
     // Skip topic_id if in the replies widget query
@@ -84 +84 @@
         // What are the default allowed statuses (based on user caps)
         if ( bbp_get_view_all( 'edit_others_replies' ) ) {
-            $default_status = join( ',', array( 'publish', $bbp->closed_status_id, $bbp->spam_status_id, 'trash' ) );
+            $default_status = join( ',', array( bbp_get_public_status_id(), bbp_get_closed_status_id(), bbp_get_spam_status_id(), 'trash' ) );
         }
     }
@@ -369 +369 @@
      */
     function bbp_get_reply_url( $reply_id = 0, $redirect_to = '' ) {
-        global $bbp, $wp_rewrite;
+        global $wp_rewrite;
 
         // Set needed variables
@@ -692 +692 @@
     function bbp_get_reply_status( $reply_id = 0 ) {
         $reply_id = bbp_get_reply_id( $reply_id );
-
         return apply_filters( 'bbp_get_reply_status', get_post_status( $reply_id ), $reply_id );
     }
@@ -707 +706 @@
  */
 function bbp_is_reply_published( $reply_id = 0 ) {
-    global $bbp;
-
     $reply_status = bbp_get_reply_status( bbp_get_reply_id( $reply_id ) );
-    return apply_filters( 'bbp_is_reply_published', 'publish' == $reply_status, $reply_id );
+    return apply_filters( 'bbp_is_reply_published', bbp_get_public_status_id() == $reply_status, $reply_id );
 }
 
@@ -724 +721 @@
  */
 function bbp_is_reply_spam( $reply_id = 0 ) {
-    global $bbp;
-
     $reply_status = bbp_get_reply_status( bbp_get_reply_id( $reply_id ) );
-
-    return apply_filters( 'bbp_is_reply_spam', $bbp->spam_status_id == $reply_status, $reply_id );
+    return apply_filters( 'bbp_is_reply_spam', bbp_get_spam_status_id() == $reply_status, $reply_id );
 }
 
@@ -742 +736 @@
  */
 function bbp_is_reply_trash( $reply_id = 0 ) {
-    global $bbp;
-
     $reply_status = bbp_get_reply_status( bbp_get_reply_id( $reply_id ) );
-
-    return apply_filters( 'bbp_is_reply_trash', $bbp->trash_status_id == $reply_status, $reply_id );
+    return apply_filters( 'bbp_is_reply_trash', bbp_get_trash_status_id() == $reply_status, $reply_id );
 }
 
@@ -1337 +1328 @@
      */
     function bbp_get_reply_admin_links( $args = '' ) {
-        global $bbp;
 
         $defaults = array (
@@ -1383 +1373 @@
         // See if links need to be unset
         $reply_status = bbp_get_reply_status( $r['id'] );
-        if ( in_array( $reply_status, array( $bbp->spam_status_id, $bbp->trash_status_id ) ) ) {
+        if ( in_array( $reply_status, array( bbp_get_spam_status_id(), bbp_get_trash_status_id() ) ) ) {
 
             // Spam link shouldn't be visible on trashed topics
-            if ( $reply_status == $bbp->trash_status_id )
+            if ( $reply_status == bbp_get_trash_status_id() )
                 unset( $r['links']['spam'] );
 
             // Trash link shouldn't be visible on spam topics
-            elseif ( isset( $r['links']['trash'] ) && $reply_status == $bbp->spam_status_id )
+            elseif ( isset( $r['links']['trash'] ) && $reply_status == bbp_get_spam_status_id() )
                 unset( $r['links']['trash'] );
         }