Ticket #2653: 2653.3.diff

src/includes/admin/tools.php

@@ -290 +290 @@
                 20 => array( 'bbp-sync-all-topics-sticky',   __( 'Recalculate sticky relationship of each topic',     'bbpress' ), 'bbp_admin_repair_sticky'                   ),
                 25 => array( 'bbp-sync-all-reply-positions', __( 'Recalculate the position of each reply',            'bbpress' ), 'bbp_admin_repair_reply_menu_order'         ),
                 30 => array( 'bbp-group-forums',             __( 'Repair BuddyPress Group Forum relationships',       'bbpress' ), 'bbp_admin_repair_group_forum_relationship' ),
-                35 => array( 'bbp-forum-topics',             __( 'Count topics in each forum',                        'bbpress' ), 'bbp_admin_repair_forum_topic_count'        ),
-                40 => array( 'bbp-forum-replies',            __( 'Count replies in each forum',                       'bbpress' ), 'bbp_admin_repair_forum_reply_count'        ),
-                45 => array( 'bbp-topic-replies',            __( 'Count replies in each topic',                       'bbpress' ), 'bbp_admin_repair_topic_reply_count'        ),
-                50 => array( 'bbp-topic-voices',             __( 'Count voices in each topic',                        'bbpress' ), 'bbp_admin_repair_topic_voice_count'        ),
-                55 => array( 'bbp-topic-hidden-replies',     __( 'Count spammed & trashed replies in each topic',     'bbpress' ), 'bbp_admin_repair_topic_hidden_reply_count' ),
-                60 => array( 'bbp-user-topics',              __( 'Count topics for each user',                        'bbpress' ), 'bbp_admin_repair_user_topic_count'         ),
-                65 => array( 'bbp-user-replies',             __( 'Count replies for each user',                       'bbpress' ), 'bbp_admin_repair_user_reply_count'         ),
-                70 => array( 'bbp-user-favorites',           __( 'Remove trashed topics from user favorites',         'bbpress' ), 'bbp_admin_repair_user_favorites'           ),
-                75 => array( 'bbp-user-topic-subscriptions', __( 'Remove trashed topics from user subscriptions',     'bbpress' ), 'bbp_admin_repair_user_topic_subscriptions' ),
-                80 => array( 'bbp-user-forum-subscriptions', __( 'Remove trashed forums from user subscriptions',     'bbpress' ), 'bbp_admin_repair_user_forum_subscriptions' ),
-                85 => array( 'bbp-user-role-map',            __( 'Remap existing users to default forum roles',       'bbpress' ), 'bbp_admin_repair_user_roles'               )
+                35 => array( 'bbp-sync-closed-topics',       __( 'Repair closed topics',                              'bbpress' ), 'bbp_admin_repair_closed_topics'            ),
+                40 => array( 'bbp-forum-topics',             __( 'Count topics in each forum',                        'bbpress' ), 'bbp_admin_repair_forum_topic_count'        ),
+                45 => array( 'bbp-forum-replies',            __( 'Count replies in each forum',                       'bbpress' ), 'bbp_admin_repair_forum_reply_count'        ),
+                50 => array( 'bbp-topic-replies',            __( 'Count replies in each topic',                       'bbpress' ), 'bbp_admin_repair_topic_reply_count'        ),
+                55 => array( 'bbp-topic-voices',             __( 'Count voices in each topic',                        'bbpress' ), 'bbp_admin_repair_topic_voice_count'        ),
+                60 => array( 'bbp-topic-hidden-replies',     __( 'Count spammed & trashed replies in each topic',     'bbpress' ), 'bbp_admin_repair_topic_hidden_reply_count' ),
+                65 => array( 'bbp-user-topics',              __( 'Count topics for each user',                        'bbpress' ), 'bbp_admin_repair_user_topic_count'         ),
+                70 => array( 'bbp-user-replies',             __( 'Count replies for each user',                       'bbpress' ), 'bbp_admin_repair_user_reply_count'         ),
+                75 => array( 'bbp-user-favorites',           __( 'Remove trashed topics from user favorites',         'bbpress' ), 'bbp_admin_repair_user_favorites'           ),
+                80 => array( 'bbp-user-topic-subscriptions', __( 'Remove trashed topics from user subscriptions',     'bbpress' ), 'bbp_admin_repair_user_topic_subscriptions' ),
+                85 => array( 'bbp-user-forum-subscriptions', __( 'Remove trashed forums from user subscriptions',     'bbpress' ), 'bbp_admin_repair_user_forum_subscriptions' ),
+                90 => array( 'bbp-user-role-map',            __( 'Remap existing users to default forum roles',       'bbpress' ), 'bbp_admin_repair_user_roles'               )
         );
         ksort( $repair_list );
 
@@ -1215 +1216 @@
 }
 
 /**
+ * Repair closed topics
+ *
+ * Closed topics that are missing the postmeta "_bbp_status" key value "publish"
+ * result in unexpected behaviour, primarily this would have only occured if you
+ * had imported forums from another forum package previous to bbPress v2.6,
+ * https://bbpress.trac.wordpress.org/ticket/2577
+ *
+ * @since bbPress (rXXXX)
+ *
+ * @uses wpdb::get_col() To run our recount sql queries
+ * @uses is_wp_error() To check if the executed query returned {@link WP_Error}
+ * @uses bbp_get_topic_post_type() To get the topic post type
+ * @uses get_post_meta() To get the sticky topics
+ * @uses update_post_meta To update the topics sticky post meta
+ * @return array An array of the status code and the message
+ */
+function bbp_admin_repair_closed_topics() {
+        global $wpdb;
+
+        $statement     = __( 'Repairing closed topics… %s', 'bbpress' );
+        $changed       = 0;
+        $result        = __( 'Failed!', 'bbpress' );
+        $closed_topics = $wpdb->get_col( "SELECT ID FROM `{$wpdb->posts}` WHERE `post_type` = '" . bbp_get_topic_post_type() . "' AND `post_status` = 'closed';" );
+
+        // Bail if no closed topics found
+        if ( empty( $closed_topics ) || is_wp_error( $closed_topics ) )
+                return array( 1, sprintf( $statement, $result ) );
+
+        // Loop through each closed topic
+        foreach ( $closed_topics as $closed_topic ) {
+
+                // Check if the closed topic already has a postmeta _bbp_status value
+                $topic_status = get_post_meta( $closed_topic, '_bbp_status', true );
+
+                // If we don't have a postmeta _bbp_status value
+                if( empty($topic_status) ) {
+                        update_post_meta($closed_topic, '_bbp_status', 'publish');
+                        ++$changed; // Keep a count to display at the end
+                }
+        }
+
+        // Cleanup
+        unset( $closed_topics, $closed_topic, $topic_status );
+
+        // Complete results
+        $result = sprintf( _n( 'Complete! 1 closed topic repaired.', 'Complete! %s closed topics repaired.', $changed, 'bbpress' ), $changed );
+        return array( 0, sprintf( $statement, $result ) );
+}
+
+/**
  * Recaches the private and hidden forums
  *
  * @since bbPress (r4104)

src/includes/topics/functions.php

@@ -338 +338 @@
 
         /** No Errors *************************************************************/
 
-        if ( ! empty( $topic_id ) && ! is_wp_error( $topic_id ) ) {
+        if ( !empty( $topic_id ) && !is_wp_error( $topic_id ) ) {
 
+                /** Close Check *******************************************************/
+
+                // If the topic is closed, close it properly
+                if ( ( get_post_field( 'post_status', $topic_id ) === bbp_get_closed_status_id() ) || ( $topic_data['post_status'] === bbp_get_closed_status_id() ) ) {
+
+                        // Close the topic
+                        bbp_close_topic( $topic_id );
+                }
+
                 /** Trash Check *******************************************************/
 
                 // If the forum is trash, or the topic_status is switched to
@@ -2763 +2772 @@
  *
  * @param int $topic_id Topic id
  * @uses bbp_get_topic() To get the topic
+ * @uses get_post_meta() To get the topic status meta
  * @uses do_action() Calls 'bbp_close_topic' with the topic id
  * @uses add_post_meta() To add the previous status to a meta
+ * @uses post_type_supports() To check if revisions are enabled
+ * @uses bbp_get_topic_post_type() To get the topic post type
+ * @uses remove_post_type_support() To temporarily remove topic revisions
+ * @uses add_post_type_support() To restore topic revisions
  * @uses wp_update_post() To update the topic with the new status
  * @uses do_action() Calls 'bbp_opened_topic' with the topic id
  * @return mixed False or {@link WP_Error} on failure, topic id on success
@@ -2777 +2791 @@
                 return $topic;
         }
 
-        // Bail if already closed
-        if ( bbp_get_closed_status_id() === $topic->post_status ) {
+        // Get previous topic status meta
+        $topic_status = get_post_meta( $topic_id, '_bbp_status', true );
+
+        // Bail if already closed and topic status meta exists
+        if ( bbp_get_closed_status_id() === $topic->post_status && ! empty( $topic_status ) ) {
                 return false;
         }
 
+        // Set status meta public
+        $topic_status = bbp_get_public_status_id();
+
         // Execute pre close code
         do_action( 'bbp_close_topic', $topic_id );
 
         // Add pre close status
-        add_post_meta( $topic_id, '_bbp_status', $topic->post_status );
+        add_post_meta( $topic_id, '_bbp_status', $topic_status );
 
         // Set closed status
         $topic->post_status = bbp_get_closed_status_id();
 
-        // No revisions
-        remove_action( 'pre_post_update', 'wp_save_post_revision' );
+        // Toggle revisions off as we are not altering content
+        if ( post_type_supports( bbp_get_topic_post_type(), 'revisions' ) ) {
+                $revisions_removed = true;
+                remove_post_type_support( bbp_get_topic_post_type(), 'revisions' );
+        }
 
         // Update topic
         $topic_id = wp_update_post( $topic );
 
+        // Toggle revisions back on
+        if ( true === $revisions_removed ) {
+                $revisions_removed = false;
+                add_post_type_support( bbp_get_topic_post_type(), 'revisions' );
+        }
+
         // Execute post close code
         do_action( 'bbp_closed_topic', $topic_id );