Ticket #6301: 6301.01.patch

src/bp-core/bp-core-buddybar.php

@@ -236 +236 @@
  *           access to the subnav item, otherwise false. Can be set dynamically
  *           when registering the subnav; eg, use bp_is_my_profile() to restrict
  *           access to profile owners only. Default: true.
+ *     @type bool $user_can_see_nav_item Optional. True if the logged-in user
+ *                       can see the subnav item, otherwise false. Default: true.
  *     @type bool $site_admin_only Optional. Whether the nav item should be
  *           visible only to site admins (those with the 'bp_moderate' cap).
  *           Default: false.
@@ -254 +256 @@
 function bp_core_new_subnav_item( $args = '' ) {
         $bp = buddypress();
 
+        // Backward compatibility: If 'user_has_access' was specified,
+        // but 'user_can_see_nav_item' is not set, we will assume the developer
+        // assumed 'user_has_access' controlled both visibility and access.
+        if ( isset( $args['user_has_access'] ) && ! isset( $args['user_can_see_nav_item'] ) ) {
+                $args['user_can_see_nav_item'] = $args['user_has_access'];
+        }
+
         $r = wp_parse_args( $args, array(
-                'name'              => false, // Display name for the nav item
-                'slug'              => false, // URL slug for the nav item
-                'parent_slug'       => false, // URL slug of the parent nav item
-                'parent_url'        => false, // URL of the parent item
-                'item_css_id'       => false, // The CSS ID to apply to the HTML of the nav item
-                'user_has_access'   => true,  // Can the logged in user see this nav item?
-                'no_access_url'     => '',
-                'site_admin_only'   => false, // Can only site admins see this nav item?
-                'position'          => 90,    // Index of where this nav item should be positioned
-                'screen_function'   => false, // The name of the function to run when clicked
-                'link'              => '',    // The link for the subnav item; optional, not usually required.
-                'show_in_admin_bar' => false, // Show the Manage link in the current group's "Edit" Admin Bar menu
+                'name'                          => false, // Display name for the nav item
+                'slug'                          => false, // URL slug for the nav item
+                'parent_slug'                   => false, // URL slug of the parent nav item
+                'parent_url'                    => false, // URL of the parent item
+                'item_css_id'                   => false, // The CSS ID to apply to the HTML of the nav item
+                'user_has_access'               => true,  // Can the logged in user visit this nav item?
+                'no_access_url'                 => '',
+                'user_can_see_nav_item'         => true,  // Can the logged in user see this nav item?
+                'site_admin_only'               => false, // Can only site admins see this nav item?
+                'position'                      => 90,    // Index of where this nav item should be positioned
+                'screen_function'               => false, // The name of the function to run when clicked
+                'link'                          => '',    // The link for the subnav item; optional, not usually required.
+                'show_in_admin_bar'             => false, // Show the Manage link in the current group's "Edit" Admin Bar menu
         ) );
 
         extract( $r, EXTR_SKIP );
@@ -293 +303 @@
                 $item_css_id = $slug;
 
         $subnav_item = array(
-                'name'              => $name,
-                'link'              => trailingslashit( $link ),
-                'slug'              => $slug,
-                'css_id'            => $item_css_id,
-                'position'          => $position,
-                'user_has_access'   => $user_has_access,
-                'no_access_url'     => $no_access_url,
-                'screen_function'   => &$screen_function,
-                'show_in_admin_bar' => (bool) $r['show_in_admin_bar'],
+                'name'                          => $name,
+                'link'                          => trailingslashit( $link ),
+                'slug'                          => $slug,
+                'css_id'                        => $item_css_id,
+                'position'                      => $position,
+                'user_has_access'               => $user_has_access,
+                'user_can_see_nav_item'         => $user_can_see_nav_item,
+                'no_access_url'                 => $no_access_url,
+                'screen_function'               => &$screen_function,
+                'show_in_admin_bar'             => (bool) $r['show_in_admin_bar'],
         );
 
         $bp->bp_options_nav[$parent_slug][$slug] = $subnav_item;

src/bp-core/bp-core-template.php

@@ -57 +57 @@
 
         // Loop through each navigation item
         foreach ( (array) $bp->bp_options_nav[$the_index] as $subnav_item ) {
-                if ( empty( $subnav_item['user_has_access'] ) ) {
+                if ( false == $subnav_item['user_can_see_nav_item'] ) {
                         continue;
                 }