Changeset 4222 for trunk/bbp-includes/bbp-reply-functions.php

Timestamp:

09/17/2012 12:03:03 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Capabilities:

• Remove experimental Bozo functionality. We can use the 'participate' to prevent forum participation without creating topics or replies.
• Introduce functions to reset, save, and remove user capabilities.
• Use these functions in both theme-side and admin-side profiles.
• Add capabilities to bbp-twentyten theme. This will be moved into the stand-alone bbp-twentyten theme soon'ish.

File:

• trunk/bbp-includes/bbp-reply-functions.php (modified) (8 diffs)

trunk/bbp-includes/bbp-reply-functions.php

@@ -221 +221 @@
     if ( !bbp_check_for_moderation( $anonymous_data, $reply_author, $reply_title, $reply_content ) ) {
         $reply_status = bbp_get_pending_status_id();
-
-    // Maybe set as bozo status
-    } elseif ( bbp_is_user_bozo() ) {
-        $reply_status = bbp_get_bozo_status_id();
 
     // Default
@@ -391 +387 @@
 
     // Define local variable(s)
-    $reply = $reply_id = $topic_id = $forum_id = $anonymous_data = 0;
+    $reply = $reply_id = $reply_author = $topic_id = $forum_id = $anonymous_data = 0;
     $reply_title = $reply_content = $reply_edit_reason = $terms = '';
 
@@ -422 +418 @@
 
         // Check users ability to create new reply
-        if ( !bbp_is_reply_anonymous( $reply_id ) ) {
+        if ( ! bbp_is_reply_anonymous( $reply_id ) ) {
 
             // User cannot edit this reply
@@ -430 +426 @@
             }
 
+            // Set reply author
+            $reply_author = bbp_get_reply_author_id( $reply_id );
+
         // It is an anonymous post
         } else {
@@ -494 +493 @@
     /** Reply Blacklist *******************************************************/
 
-    if ( !bbp_check_for_blacklist( $anonymous_data, bbp_get_reply_author_id( $reply_id ), $reply_title, $reply_content ) )
+    if ( !bbp_check_for_blacklist( $anonymous_data, $reply_author, $reply_title, $reply_content ) )
         bbp_add_error( 'bbp_reply_blacklist', __( '<strong>ERROR</strong>: Your reply cannot be edited at this time.', 'bbpress' ) );
 
@@ -500 +499 @@
 
     // Maybe put into moderation
-    if ( !bbp_check_for_moderation( $anonymous_data, bbp_get_reply_author_id( $reply_id ), $reply_title, $reply_content ) ) {
+    if ( !bbp_check_for_moderation( $anonymous_data, $reply_author, $reply_title, $reply_content ) ) {
         $reply_status = bbp_get_pending_status_id();
-
-    // Maybe set as bozo status
-    } elseif ( bbp_is_user_bozo() ) {
-        $reply_status = bbp_get_bozo_status_id();
 
     // Default
@@ -544 +539 @@
         'post_content' => $reply_content,
         'post_status'  => $reply_status,
-        'post_parent'  => $reply->post_parent,
-        'post_author'  => $reply->post_author,
+        'post_parent'  => $topic_id,
+        'post_author'  => $reply_author,
         'post_type'    => bbp_get_reply_post_type()
     ) );
@@ -589 +584 @@
 
         // Update counts, etc...
-        do_action( 'bbp_edit_reply', $reply_id, $topic_id, $forum_id, $anonymous_data, $reply->post_author , true /* Is edit */ );
+        do_action( 'bbp_edit_reply', $reply_id, $topic_id, $forum_id, $anonymous_data, $reply_author , true /* Is edit */ );
 
         /** Additional Actions (After Save) ***********************************/