Changeset 3505 for branches/plugin/bbp-includes/bbp-topic-functions.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-topic-functions.php (modified) (25 diffs)

branches/plugin/bbp-includes/bbp-topic-functions.php

@@ -32 +32 @@
     $default_topic = array(
         'post_parent'   => 0, // forum ID
-        'post_status'   => 'publish',
+        'post_status'   => bbp_get_public_status_id(),
         'post_type'     => bbp_get_topic_post_type(),
         'post_author'   => 0,
@@ -124 +124 @@
         return;
 
-    global $bbp;
-
     // Nonce check
     check_admin_referer( 'bbp-new-topic' );
@@ -268 +266 @@
             'post_parent'  => $forum_id,
             'tax_input'    => $terms,
-            'post_status'  => 'publish',
+            'post_status'  => bbp_get_public_status_id(),
             'post_type'    => bbp_get_topic_post_type()
         );
@@ -310 +308 @@
             // If the forum is trash, or the topic_status is switched to
             // trash, trash it properly
-            if ( ( get_post_field( 'post_status', $forum_id ) == $bbp->trash_status_id ) || ( $topic_data['post_status'] == $bbp->trash_status_id ) ) {
+            if ( ( get_post_field( 'post_status', $forum_id ) == bbp_get_trash_status_id() ) || ( $topic_data['post_status'] == bbp_get_trash_status_id() ) ) {
 
                 // Trash the reply
@@ -322 +320 @@
 
             // If reply or topic are spam, officially spam this reply
-            if ( $topic_data['post_status'] == $bbp->spam_status_id ) {
-                add_post_meta( $topic_id, '_bbp_spam_meta_status', 'publish' );
+            if ( $topic_data['post_status'] == bbp_get_spam_status_id() ) {
+                add_post_meta( $topic_id, '_bbp_spam_meta_status', bbp_get_public_status_id() );
 
                 // Force view=all
@@ -817 +815 @@
     if ( true == $refresh ) {
         $forum_id = $topic_id = $reply_id = $active_id = $last_active_time = 0;
-        $topic_status = 'publish';
+        $topic_status = bbp_get_public_status_id();
     }
 
@@ -1279 +1277 @@
         return;
 
-    global $wpdb, $bbp;
+    global $wpdb;
 
     // Prevent debug notices
@@ -2122 +2120 @@
  */
 function bbp_update_topic_reply_count_hidden( $topic_id = 0, $reply_count = 0 ) {
-    global $wpdb, $bbp;
+    global $wpdb;
 
     // If it's a reply, then get the parent (topic id)
@@ -2132 +2130 @@
     // Get replies of topic
     if ( empty( $reply_count ) )
-        $reply_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(ID) FROM {$wpdb->posts} WHERE post_parent = %d AND post_status IN ( '" . join( '\',\'', array( $bbp->trash_status_id, $bbp->spam_status_id ) ) . "') AND post_type = '%s';", $topic_id, bbp_get_reply_post_type() ) );
+        $reply_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(ID) FROM {$wpdb->posts} WHERE post_parent = %d AND post_status IN ( '" . join( '\',\'', array( bbp_get_trash_status_id(), bbp_get_spam_status_id() ) ) . "') AND post_type = '%s';", $topic_id, bbp_get_reply_post_type() ) );
 
     update_post_meta( $topic_id, '_bbp_reply_count_hidden', (int) $reply_count );
@@ -2173 +2171 @@
 
     // Update only if published
-    if ( 'publish' == get_post_status( $active_id ) )
+    if ( bbp_get_public_status_id() == get_post_status( $active_id ) )
         update_post_meta( $topic_id, '_bbp_last_active_id', (int) $active_id );
 
@@ -2285 +2283 @@
 
     // Query the DB to get voices in this topic
-    $voices = $wpdb->get_col( $wpdb->prepare( "SELECT COUNT( DISTINCT post_author ) FROM {$wpdb->posts} WHERE ( post_parent = %d AND post_status = 'publish' AND post_type = '%s' ) OR ( ID = %d AND post_type = '%s' );", $topic_id, bbp_get_reply_post_type(), $topic_id, bbp_get_topic_post_type() ) );
+    $voices = $wpdb->get_col( $wpdb->prepare( "SELECT COUNT( DISTINCT post_author ) FROM {$wpdb->posts} WHERE ( post_parent = %d AND post_status = '%s' AND post_type = '%s' ) OR ( ID = %d AND post_type = '%s' );", $topic_id, bbp_get_public_status_id(), bbp_get_reply_post_type(), $topic_id, bbp_get_topic_post_type() ) );
 
     // If there's an error, make sure we at least have 1 voice
@@ -2326 +2324 @@
         return;
 
-    $anonymous_replies = (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT( ID ) FROM {$wpdb->posts} WHERE ( post_parent = %d AND post_status = 'publish' AND post_type = '%s' AND post_author = 0 ) OR ( ID = %d AND post_type = '%s' AND post_author = 0 );", $topic_id, bbp_get_reply_post_type(), $topic_id, bbp_get_topic_post_type() ) );
+    $anonymous_replies = (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT( ID ) FROM {$wpdb->posts} WHERE ( post_parent = %d AND post_status = '%s' AND post_type = '%s' AND post_author = 0 ) OR ( ID = %d AND post_type = '%s' AND post_author = 0 );", $topic_id, bbp_get_public_status_id(), bbp_get_reply_post_type(), $topic_id, bbp_get_topic_post_type() ) );
 
     update_post_meta( $topic_id, '_bbp_anonymous_reply_count', (int) $anonymous_replies );
@@ -2391 +2389 @@
  */
 function bbp_close_topic( $topic_id = 0 ) {
-    global $bbp;
 
     // Get topic
@@ -2398 +2395 @@
 
     // Bail if already closed
-    if ( $topic['post_status'] == $bbp->closed_status_id )
+    if ( bbp_get_closed_status_id == $topic['post_status'] )
         return false;
 
@@ -2408 +2405 @@
 
     // Set closed status
-    $topic['post_status'] = $bbp->closed_status_id;
+    $topic['post_status'] = bbp_get_closed_status_id();
 
     // No revisions
@@ -2438 +2435 @@
  */
 function bbp_open_topic( $topic_id = 0 ) {
-    global $bbp;
 
     // Get topic
@@ -2445 +2441 @@
 
     // Bail if already open
-    if ( $topic['post_status'] != $bbp->closed_status_id )
+    if ( bbp_get_closed_status_id() != $topic['post_status'])
         return false;
 
@@ -2487 +2483 @@
  */
 function bbp_spam_topic( $topic_id = 0 ) {
-    global $bbp;
 
     // Get the topic
@@ -2494 +2489 @@
 
     // Bail if topic is spam
-    if ( $topic['post_status'] == $bbp->spam_status_id )
+    if ( bbp_get_spam_status_id() == $topic['post_status'] )
         return false;
 
@@ -2526 +2521 @@
     
     // Set post status to spam
-    $topic['post_status'] = $bbp->spam_status_id;
+    $topic['post_status'] = bbp_get_spam_status_id();
 
     // No revisions
@@ -2556 +2551 @@
  */
 function bbp_unspam_topic( $topic_id = 0 ) {
-    global $bbp;
 
     // Get the topic
@@ -2563 +2557 @@
 
     // Bail if already not spam
-    if ( $topic['post_status'] != $bbp->spam_status_id )
+    if ( bbp_get_spam_status_id() != $topic['post_status'] )
         return false;
 
@@ -2713 +2707 @@
  */
 function bbp_delete_topic( $topic_id = 0 ) {
-    global $bbp;
 
     // Validate topic ID
@@ -2724 +2717 @@
 
     // Valid topic/reply statuses
-    $post_stati = join( ',', array( 'publish', $bbp->spam_status_id, 'trash' ) );
+    $post_stati = join( ',', array( bbp_get_public_status_id(), bbp_get_spam_status_id(), 'trash' ) );
 
     // Topic is being permanently deleted, so its replies gotta go too
@@ -2774 +2767 @@
     if ( bbp_has_replies( array( 
         'post_type'      => bbp_get_reply_post_type(),
-        'post_status'    => 'publish',
+        'post_status'    => bbp_get_public_status_id(),
         'posts_per_page' => -1,
         'meta_query'     => array( array(