Ticket #2089: 2089.2.diff

includes/admin/tools.php

@@ -313 +313 @@
         $groups_meta_table = $prefix . 'bp_groups_groupmeta';
 
         // Get the converted forum IDs
-        $forum_ids = $wpdb->query( "SELECT `forum`.`ID`, `forummeta`.`meta_value`
+        $forum_ids = $wpdb->query( "SELECT `forum`.`ID`, `forummeta`.`meta_value`, `group`.`id`
                                                                 FROM `{$wpdb->posts}` AS `forum`
                                                                         LEFT JOIN `{$wpdb->postmeta}` AS `forummeta`
                                                                                 ON `forum`.`ID` = `forummeta`.`post_id`
                                                                                 AND `forummeta`.`meta_key` = '_bbp_old_forum_id'
-                                                                WHERE `forum`.`post_type` = 'forum'
+                                                                        LEFT JOIN `{$groups_table}` AS `group`
+                                                                                ON `group`.`slug` = `forum`.`post_name`
+                                                                WHERE `forum`.`post_type` = 'forum' AND `group`.`id` > 0
                                                                 GROUP BY `forum`.`ID`;" );
 
         // Bail if forum IDs returned an error
@@ -336 +338 @@
                         continue;
 
                 // Attempt to update group meta
-                $updated = $wpdb->query( "UPDATE `{$groups_meta_table}` SET `meta_value` = '{$group_forums->ID}' WHERE `meta_key` = 'forum_id' AND `meta_value` = '{$group_forums->meta_value}';" );
+                $updated = $wpdb->query( "UPDATE `{$groups_meta_table}` SET `meta_value` = '{$group_forums->ID}' WHERE `meta_key` = 'forum_id' AND `group_id` = '{$group_forums->id}';" );
 
                 // Bump the count
                 if ( !empty( $updated ) && ! is_wp_error( $updated ) ) {
@@ -404 +406 @@
                         wp_update_post( array(
                                 'ID'         => $posts[0]->ID,
                                 'post_title' => __( 'Group Forums', 'bbpress' ),
+                                'post_name'  => __( 'group-forums', 'bbpress' ),
                         ) );
                 }