Changeset 5519 for trunk/bp-groups/bp-groups-adminbar.php

Timestamp:

12/11/2011 10:01:08 PM (15 years ago)

Author:

johnjamesjacoby

Message:

Remove the Edit Page menu when viewing a group. Remove the group name and avatar from Edit Group menu. Fixes #3838.

File:

• trunk/bp-groups/bp-groups-adminbar.php (modified) (2 diffs)

trunk/bp-groups/bp-groups-adminbar.php

@@ -31 +31 @@
                 return false;
 
-        // Group avatar
-        $avatar = bp_core_fetch_avatar( array(
-                'object'     => 'group',
-                'type'       => 'thumb',
-                'avatar_dir' => 'group-avatars',
-                'item_id'    => $bp->groups->current_group->id,
-                'width'      => 16,
-                'height'     => 16,
-                'alt'        => sprintf( __( 'Group logo of %s', 'buddypress' ), $bp->groups->current_group->name )
-        ) );
-
-        // Unique ID for the 'My Account' menu
-        $bp->group_admin_menu_id = ( ! empty( $avatar ) ) ? 'group-admin-with-avatar' : 'group-admin';
+        // Unique ID for the 'Edit Group' menu
+        $bp->group_admin_menu_id = 'group-admin';
 
         // Add the top-level Group Admin button
         $wp_admin_bar->add_menu( array(
                 'id'    => $bp->group_admin_menu_id,
-                'title' => $avatar . bp_get_current_group_name(),
+                'title' => __( 'Edit Group', 'buddypress' ),
                 'href'  => bp_get_group_permalink( $bp->groups->current_group )
         ) );
@@ -116 +105 @@
 add_action( 'admin_bar_menu', 'bp_groups_group_admin_menu', 99 );
 
+/**
+ * Remove rogue WP core edit menu when viewing a group
+ *
+ * @since BuddyPress (1.6)
+ */
+function bp_groups_remove_edit_page_menu() {
+        if ( bp_is_group() ) {
+                remove_action( 'admin_bar_menu', 'wp_admin_bar_edit_menu', 80 );
+        }
+}
+add_action( 'bp_init', 'bp_groups_remove_edit_page_menu', 99 );
+
 ?>