Changeset 10326 for trunk/src/bp-core/bp-core-buddybar.php

Timestamp:

11/06/2015 12:39:46 AM (9 years ago)

Author:

dcavins

Message:

Allow access-protected bp_nav items to exist.

Fix error introduced in r10003 that prevents
access-protected nav items from being added to the
bp_nav array. The access protection should
happen at access time in
bp_core_register_nav_screen_function().

See #6503.

File:

• trunk/src/bp-core/bp-core-buddybar.php (modified) (3 diffs)

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

@@ -57 +57 @@
 
     // Then, hook the screen function for the added nav item.
-    bp_core_register_nav_screen_function( $r );
+    $hooked = bp_core_register_nav_screen_function( $r );
+    if ( false === $hooked ){
+        return false;
+    }
 
     /**
@@ -119 +122 @@
     // If this is for site admins only and the user is not one, don't create the nav item.
     if ( ! empty( $r['site_admin_only'] ) && ! bp_current_user_can( 'bp_moderate' ) ) {
-        return false;
-    }
-
-    /**
-     * If this nav item is hidden for the displayed user, and
-     * the logged in user is not the displayed user
-     * looking at their own profile, don't create the nav item.
-     */
-    if ( empty( $r['show_for_displayed_user'] ) && ! bp_user_has_access() ) {
         return false;
     }
@@ -415 +409 @@
 
     // Then, hook the screen function for the added subnav item.
-    bp_core_register_subnav_screen_function( $args );
-
+    $hooked = bp_core_register_subnav_screen_function( $args );
+    if ( false === $hooked ) {
+        return false;
+    }
 }