Changeset 4222 for trunk/bbp-includes/bbp-topic-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-topic-functions.php (modified) (8 diffs)

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

@@ -243 +243 @@
     if ( !bbp_check_for_moderation( $anonymous_data, $topic_author, $topic_title, $topic_content ) ) {
         $topic_status = bbp_get_pending_status_id();
-
-    // Maybe set as bozo status
-    } elseif ( bbp_is_user_bozo() ) {
-        $topic_status = bbp_get_bozo_status_id();
 
     // Default to published
@@ -438 +434 @@
 
     // Define local variable(s)
-    $topic = $topic_id = $forum_id = $anonymous_data = 0;
+    $topic = $topic_id = $topic_author = $forum_id = $anonymous_data = 0;
     $topic_title = $topic_content = $topic_edit_reason = '';
 
@@ -463 +459 @@
 
         // Check users ability to create new topic
-        if ( !bbp_is_topic_anonymous( $topic_id ) ) {
+        if ( ! bbp_is_topic_anonymous( $topic_id ) ) {
 
             // User cannot edit this topic
@@ -470 +466 @@
             }
 
+            // Set topic author
+            $topic_author = bbp_get_topic_author_id( $topic_id );
+
         // It is an anonymous post
         } else {
@@ -550 +549 @@
     /** Topic Blacklist *******************************************************/
     
-    if ( !bbp_check_for_blacklist( $anonymous_data, bbp_get_topic_author_id( $topic_id ), $topic_title, $topic_content ) )
+    if ( !bbp_check_for_blacklist( $anonymous_data, $topic_author, $topic_title, $topic_content ) )
         bbp_add_error( 'bbp_topic_blacklist', __( '<strong>ERROR</strong>: Your topic cannot be edited at this time.', 'bbpress' ) );
 
@@ -558 +557 @@
     if ( !bbp_check_for_moderation( $anonymous_data, $topic_author, $topic_title, $topic_content ) ) {
         $topic_status = bbp_get_pending_status_id();
-
-    // Maybe set as bozo status
-    } elseif ( bbp_is_user_bozo() ) {
-        $topic_status = bbp_get_bozo_status_id();
 
     // Default to published
@@ -610 +605 @@
         'post_status'  => $topic_status,
         'post_parent'  => $forum_id,
-        'post_author'  => $topic->post_author,
+        'post_author'  => $topic_author,
         'post_type'    => bbp_get_topic_post_type(),
         'tax_input'    => $terms,
@@ -664 +659 @@
 
         // Update counts, etc...
-        do_action( 'bbp_edit_topic', $topic_id, $forum_id, $anonymous_data, $topic->post_author , true /* Is edit */ );
+        do_action( 'bbp_edit_topic', $topic_id, $forum_id, $anonymous_data, $topic_author , true /* Is edit */ );
 
         // If the new forum id is not equal to the old forum id, run the