Ticket #6827: 6827-top-level.patch

src/bp-core/admin/css/common-rtl.css

@@ -349 +349 @@
         content: "\f108";
 }
 
-#adminmenu li.toplevel_page_bp-components .wp-menu-image,
-#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image {
+#adminmenu #toplevel_page_buddypress-menu .wp-menu-image:before,
+#adminmenu #toplevel_page_buddypress-menu_user .wp-menu-image:before,
+#adminmenu #toplevel_page_buddypress-menu_network .wp-menu-image:before {
         content: "\f448";
 }
 

src/bp-core/admin/css/common.css

@@ -349 +349 @@
         content: "\f108";
 }
 
-#adminmenu li.toplevel_page_bp-components .wp-menu-image,
-#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image {
+#adminmenu #toplevel_page_buddypress-menu .wp-menu-image:before,
+#adminmenu #toplevel_page_buddypress-menu_user .wp-menu-image:before,
+#adminmenu #toplevel_page_buddypress-menu_network .wp-menu-image:before {
         content: "\f448";
 }
 

src/bp-core/classes/class-bp-admin.php

@@ -183 +183 @@
                 add_filter( 'ms_user_row_actions', 'bp_core_admin_user_row_actions', 10, 2 );
                 add_filter( 'user_row_actions',    'bp_core_admin_user_row_actions', 10, 2 );
 
+                // BuddyPress top level menu.
+                add_filter( 'bp_admin_menu_order', array( $this, 'bp_core_top_level_admin_menu_order' ), 1 );
+
                 // Emails
                 add_filter( 'bp_admin_menu_order', array( $this, 'emails_admin_menu_order' ), 20 );
         }
@@ -193 +196 @@
          * Contextually hooked to site or network-admin depending on current configuration.
          *
          * @since 1.6.0
+         * @since 2.7.0 Add back the BuddyPress top level menu.
          *
          *       section.
          */
@@ -224 +228 @@
                 $hooks = array();
 
                 // Changed in BP 1.6 . See bp_core_admin_backpat_menu().
+                // Changed in BP 2.7.
                 $hooks[] = add_menu_page(
                         __( 'BuddyPress', 'buddypress' ),
                         __( 'BuddyPress', 'buddypress' ),
                         $this->capability,
-                        'bp-general-settings',
-                        'bp_core_admin_backpat_menu',
-                        'div'
+                        'buddypress-menu',
+                        'bp_core_admin_components_settings'
                 );
 
                 $hooks[] = add_submenu_page(
+                        'buddypress-menu',
+                        __( 'Settings', 'buddypress' ),
+                        __( 'Settings', 'buddypress' ),
+                        $this->capability,
+                        'buddypress-menu',
+                        'bp_core_admin_components_settings'
+                );
+
+                $hooks[] = add_submenu_page(
                         'bp-general-settings',
                         __( 'BuddyPress Help', 'buddypress' ),
                         __( 'Help', 'buddypress' ),
@@ -330 +343 @@
                 }
         }
 
+         /**
+         * Add the BuddyPress top level menu to custom menus array.
+         *
+         * This ensures that the BuddyPress top level menu item appears
+         * in the proper order on the main Dashboard menu.
+         *
+         * @since 2.7.0
+         *
+         * @param array $custom_menus Array of BP top-level menu items.
+         * @return array Menu item array, with BuddyPress menu added.
+         */
+        public function bp_core_top_level_admin_menu_order( $custom_menus = array() ) {
+                array_push( $custom_menus, 'buddypress-menu' );
+                return $custom_menus;
+        }
+
         /**
          * Register site-admin nav menu elements.
          *