Ticket #3866: 3866.01.patch

bp-core/admin/bp-core-functions.php

@@ -70 +70 @@
 function bp_core_modify_admin_menu() {
         $page  = bp_core_do_network_admin()  ? 'settings.php' : 'options-general.php';
 
-        remove_submenu_page( $page, 'bb-forums-setup' );
+        remove_submenu_page( $page, 'bp-forums' );
         remove_submenu_page( $page, 'bp-slugs'        );
         remove_submenu_page( $page, 'bp-settings'     );
 }

bp-forums/bp-forums-admin.php

@@ -10 +10 @@
 
         // Add the option pages
         $page = bp_core_do_network_admin()  ? 'settings.php' : 'options-general.php';
-        $hook = add_submenu_page( $page, __( 'BuddyPress Forums', 'buddypress' ), __( 'BuddyPress Forums', 'buddypress' ), 'manage_options', 'bb-forums-setup', 'bp_forums_bbpress_admin' );
+        $hook = add_submenu_page( $page, __( 'BuddyPress Forums', 'buddypress' ), __( 'BuddyPress Forums', 'buddypress' ), 'manage_options', 'bp-forums', 'bp_forums_bbpress_admin' );
 
         // Add a hook for common BP admin CSS/JS scripts
         add_action( "admin_print_styles-$hook", 'bp_core_add_admin_menu_styles' );
@@ -23 +23 @@
 function bp_forums_bbpress_admin() {
         global $bp;
 
-        $action = bp_get_admin_url( 'admin.php?page=bb-forums-setup&reinstall=1' ); ?>
+        $action = bp_get_admin_url( 'admin.php?page=bp-forums&reinstall=1' ); ?>
 
         <div class="wrap">
                 <?php screen_icon( 'buddypress' ); ?>
@@ -91 +91 @@
 }
 
 function bp_forums_bbpress_install_wizard() {
-        $post_url = network_admin_url( 'admin.php?page=bb-forums-setup' );
+        $post_url = network_admin_url( 'admin.php?page=bp-forums' );
 
         $step = isset( $_REQUEST['step'] ) ? $_REQUEST['step'] : '';
 

bp-themes/bp-default/groups/create.php

@@ -68 +68 @@
                                                         <?php if ( bp_current_user_can( 'bp_moderate' ) ) : ?>
 
                                                                 <div class="checkbox">
-                                                                        <label><input type="checkbox" disabled="disabled" name="disabled" id="disabled" value="0" /> <?php printf( __( '<strong>Attention Site Admin:</strong> Group forums require the <a href="%s">correct setup and configuration</a> of a bbPress installation.', 'buddypress' ), bp_get_root_domain() . '/wp-admin/admin.php?page=bb-forums-setup' ); ?></label>
+                                                                        <label><input type="checkbox" disabled="disabled" name="disabled" id="disabled" value="0" /> <?php printf( __( '<strong>Attention Site Admin:</strong> Group forums require the <a href="%s">correct setup and configuration</a> of a bbPress installation.', 'buddypress' ), bp_get_root_domain() . '/wp-admin/admin.php?page=bp-forums' ); ?></label>
                                                                 </div>
 
                                                         <?php endif; ?>