Changeset 5429

Timestamp:

07/08/2014 02:11:54 AM (11 years ago)

Author:

netweb

Message:

When resetting the forums back to pre-import status, if we are not deleting imported users, we still need to delete existing user meta-data.

• r5174 originally implemented this as if/else, antiprops netweb

Fixes #2641. Props netweb

File:

• trunk/src/includes/admin/tools.php (modified) (4 diffs)

trunk/src/includes/admin/tools.php

@@ -642 +642 @@
         return array( 1, sprintf( $statement, $result ) );
     }
- 
+
     // Recalculate the metas key _bbp_reply_count and _bbp_total_reply_count for each forum
     $forums = get_posts( array( 'post_type' => bbp_get_forum_post_type(), 'numberposts' => -1 ) );
@@ -1325 +1325 @@
     // Delete cases where `_bbp_reply_to` was accidentally set to itself
     if ( is_wp_error( $wpdb->query( "DELETE FROM `{$wpdb->postmeta}` WHERE `meta_key` = '_bbp_reply_to' AND `post_id` = `meta_value`;" ) ) ) {
-        return array( 1, sprintf( $statement, $result ) ); 
+        return array( 1, sprintf( $statement, $result ) );
     }
 
@@ -1501 +1501 @@
     /** User ******************************************************************/
 
-    // Delete users
+    // First, if we're deleting previously imported users, delete them now
     if ( !empty( $_POST['bbpress-delete-imported-users'] ) ) {
         $sql_users  = $wpdb->get_results( "SELECT `user_id` FROM `{$wpdb->usermeta}` WHERE `meta_key` = '_bbp_user_id'", OBJECT_K );
@@ -1519 +1519 @@
             $messages[] = sprintf( $statement, $result );
         }
-
-    // Delete imported user metadata
-    } else {
-        $statement  = __( 'Deleting User Meta… %s', 'bbpress' );
-        $sql_delete = "DELETE FROM `{$wpdb->usermeta}` WHERE `meta_key` LIKE '%%_bbp_%%';";
-        $result     = is_wp_error( $wpdb->query( $sql_delete ) ) ? $failed : $success;
-        $messages[] = sprintf( $statement, $result );
-    }
+    }
+
+    // Next, if we still have users that were not imported delete that meta data
+    $statement  = __( 'Deleting User Meta… %s', 'bbpress' );
+    $sql_delete = "DELETE FROM `{$wpdb->usermeta}` WHERE `meta_key` LIKE '%%_bbp_%%';";
+    $result     = is_wp_error( $wpdb->query( $sql_delete ) ) ? $failed : $success;
+    $messages[] = sprintf( $statement, $result );
 
     /** Converter *************************************************************/