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

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

@@ -32 +32 @@
     $default_reply = array(
         'post_parent'   => 0, // topic ID
-        'post_status'   => 'publish',
+        'post_status'   => bbp_get_public_status_id(),
         'post_type'     => bbp_get_reply_post_type(),
         'post_author'   => 0,
@@ -116 +116 @@
         return;
 
-    global $bbp;
-
     // Nonce check
     check_admin_referer( 'bbp-new-reply' );
@@ -232 +230 @@
             'post_content' => $reply_content,
             'post_parent'  => $topic_id,
-            'post_status'  => 'publish',
+            'post_status'  => bbp_get_public_status_id(),
             'post_type'    => bbp_get_reply_post_type()
         );
@@ -264 +262 @@
             // If this reply starts as trash, add it to pre_trashed_replies
             // for the topic, so it is properly restored.
-            if ( bbp_is_topic_trash( $topic_id ) || ( $reply_data['post_status'] == $bbp->trash_status_id ) ) {
+            if ( bbp_is_topic_trash( $topic_id ) || ( $reply_data['post_status'] == bbp_get_trash_status_id() ) ) {
 
                 // Trash the reply
@@ -282 +280 @@
 
             // If reply or topic are spam, officially spam this reply
-            if ( bbp_is_topic_spam( $topic_id ) || ( $reply_data['post_status'] == $bbp->spam_status_id ) )
-                add_post_meta( $reply_id, '_bbp_spam_meta_status', 'publish' );
+            if ( bbp_is_topic_spam( $topic_id ) || ( $reply_data['post_status'] == bbp_get_spam_status_id() ) )
+                add_post_meta( $reply_id, '_bbp_spam_meta_status', bbp_get_public_status_id() );
 
             /** Update counts, etc... *****************************************/
@@ -1078 +1076 @@
  */
 function bbp_spam_reply( $reply_id = 0 ) {
-    global $bbp;
 
     // Get reply
@@ -1085 +1082 @@
 
     // Bail if already spam
-    if ( $reply['post_status'] == $bbp->spam_status_id )
+    if ( bbp_get_spam_status_id() == $reply['post_status'] )
         return false;
 
@@ -1095 +1092 @@
 
     // Set post status to spam
-    $reply['post_status'] = $bbp->spam_status_id;
+    $reply['post_status'] = bbp_get_spam_status_id();
 
     // No revisions
@@ -1125 +1122 @@
  */
 function bbp_unspam_reply( $reply_id = 0 ) {
-    global $bbp;
 
     // Get reply
@@ -1132 +1128 @@
 
     // Bail if already not spam
-    if ( $reply['post_status'] != $bbp->spam_status_id )
+    if ( bbp_get_spam_status_id() != $reply['post_status'] )
         return false;