Changeset 4046

Timestamp:

07/02/2012 07:06:30 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Admin Menus:

• Fix issue where bbPress top-level admin-menu positions could conflict with other plugins.
• Set menu_position on post-types to 555555.
• Refactor bbp_admin_menu_order() to reposition all available custom menus above the second separator.
• Fixes #1876.

Location:

branches/plugin

Files:

• bbp-admin/bbp-functions.php (modified) (3 diffs)
• bbpress.php (modified) (3 diffs)

branches/plugin/bbp-admin/bbp-functions.php

@@ -21 +21 @@
 
     // Prevent duplicate separators when no new menu items exist
-    if ( !current_user_can( 'edit_replies' ) )
+    if ( !current_user_can( 'edit_forums' ) && !current_user_can( 'edit_topics' ) && !current_user_can( 'edit_replies' ) )
         return;
 
@@ -41 +41 @@
  * @return bool Always true
  */
-function bbp_admin_custom_menu_order( $menu_order ) {
-    if ( !current_user_can( 'edit_replies' ) )
+function bbp_admin_custom_menu_order( $menu_order = false ) {
+    if ( !current_user_can( 'edit_forums' ) && !current_user_can( 'edit_topics' ) && !current_user_can( 'edit_replies' ) )
         return $menu_order;
 
@@ -59 +59 @@
 function bbp_admin_menu_order( $menu_order ) {
 
+    // Bail if user cannot see any top level bbPress menus
+    if ( empty( $menu_order ) || ( !current_user_can( 'edit_forums' ) && !current_user_can( 'edit_topics' ) && !current_user_can( 'edit_replies' ) ) )
+        return $menu_order;
+
     // Initialize our custom order array
     $bbp_menu_order = array();
 
-    // Get the index of our custom separator
-    $bbp_separator = array_search( 'separator-bbpress', $menu_order );
-
-    // Forums
-    if ( current_user_can( 'edit_forums' ) ) {
-        $top_menu_type = bbp_get_forum_post_type();
-
-    // Topics
-    } elseif ( current_user_can( 'edit_topics' ) ) {
-        $top_menu_type = bbp_get_topic_post_type();
-
-    // Replies
-    } elseif ( current_user_can( 'edit_replies' ) ) {
-        $top_menu_type = bbp_get_reply_post_type();
-
-    // Bail if there are no bbPress menus present
-    } else {
-        return;
-    }
+    // Menu values
+    $second_sep   = 'separator2';
+    $custom_menus = array(
+        'separator-bbpress',                               // Separator
+        'edit.php?post_type=' . bbp_get_forum_post_type(), // Forums
+        'edit.php?post_type=' . bbp_get_topic_post_type(), // Topics
+        'edit.php?post_type=' . bbp_get_reply_post_type()  // Replies
+    );
 
     // Loop through menu order and do some rearranging
-    foreach ( $menu_order as $index => $item ) {
-
-        // Current item is ours, so set our separator here
-        if ( ( ( 'edit.php?post_type=' . $top_menu_type ) == $item ) ) {
-            $bbp_menu_order[] = 'separator-bbpress';
-            unset( $menu_order[$bbp_separator] );
-        }
-
-        // Skip our separator
-        if ( !in_array( $item, array( 'separator-bbpress' ) ) ) {
+    foreach ( $menu_order as $item ) {
+
+        // Position bbPress menus above appearance
+        if ( $second_sep == $item ) {
+
+            // Add our custom menus
+            foreach( $custom_menus as $custom_menu ) {
+                if ( array_search( $custom_menu, $menu_order ) ) {
+                    $bbp_menu_order[] = $custom_menu;
+                }
+            }
+
+            // Add the appearance separator
+            $bbp_menu_order[] = $second_sep;
+
+        // Skip our menu items
+        } elseif ( ! in_array( $item, $custom_menus ) ) {
             $bbp_menu_order[] = $item;
         }

branches/plugin/bbpress.php

@@ -513 +513 @@
                 'capabilities'        => bbp_get_forum_caps(),
                 'capability_type'     => array( 'forum', 'forums' ),
-                'menu_position'       => 56,
+                'menu_position'       => 555555,
                 'has_archive'         => bbp_get_root_slug(),
                 'exclude_from_search' => true,
@@ -570 +570 @@
                 'capabilities'        => bbp_get_topic_caps(),
                 'capability_type'     => array( 'topic', 'topics' ),
-                'menu_position'       => 57,
+                'menu_position'       => 555555,
                 'has_archive'         => bbp_get_topic_archive_slug(),
                 'exclude_from_search' => true,
@@ -627 +627 @@
                 'capabilities'        => bbp_get_reply_caps(),
                 'capability_type'     => array( 'reply', 'replies' ),
-                'menu_position'       => 58,
+                'menu_position'       => 555555,
                 'exclude_from_search' => true,
                 'has_archive'         => false,