Changeset 10326

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.

Location:

trunk

Files:

• src/bp-core/bp-core-buddybar.php (modified) (3 diffs)
• tests/phpunit/testcases/core/nav/bpCoreNewNavItem.php (modified) (1 diff)

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;
+    }
 }
 

trunk/tests/phpunit/testcases/core/nav/bpCoreNewNavItem.php

@@ -125 +125 @@
     }
 
+    public function test_existence_of_access_protected_user_nav() {
+        $bp_nav = buddypress()->bp_nav;
+
+        $u = $this->factory->user->create();
+        $u2 = $this->factory->user->create();
+        $old_current_user = get_current_user_id();
+        $this->set_current_user( $u2 );
+
+        $this->go_to( bp_core_get_user_domain( $u ) );
+
+        $expected = array(
+            'name'                    => 'Settings',
+            'slug'                    => 'settings',
+            'link'                    => trailingslashit( bp_loggedin_user_domain() . 'settings' ),
+            'css_id'                  => 'settings',
+            'show_for_displayed_user' => false,
+            'position'                => 100,
+            'screen_function'         => 'bp_settings_screen_general',
+            'default_subnav_slug'     => 'general'
+        );
+
+        $this->assertSame( buddypress()->bp_nav['settings'], $expected );
+
+        // Clean up
+        buddypress()->bp_nav = $bp_nav;
+        $this->set_current_user( $old_current_user );
+    }
+
+    public function test_creation_of_access_protected_user_nav() {
+        // The nav item must be added to bp_nav, even if the current user
+        // can't visit that nav item.
+        $bp_nav = buddypress()->bp_nav;
+
+        $u = $this->factory->user->create();
+        $u2 = $this->factory->user->create();
+        $old_current_user = get_current_user_id();
+        $this->set_current_user( $u2 );
+
+        $this->go_to( bp_core_get_user_domain( $u ) );
+
+        bp_core_new_nav_item( array(
+            'name'                    => 'Woof',
+            'slug'                    => 'woof',
+            'show_for_displayed_user' => false,
+            'position'                => 35,
+            'screen_function'         => 'woof_screen_function',
+            'default_subnav_slug'     => 'woof-one'
+        ) );
+
+        $expected = array(
+            'name'                    => 'Woof',
+            'slug'                    => 'woof',
+            'link'                    => trailingslashit( bp_loggedin_user_domain() . 'woof' ),
+            'css_id'                  => 'woof',
+            'show_for_displayed_user' => false,
+            'position'                => 35,
+            'screen_function'         => 'woof_screen_function',
+            'default_subnav_slug'     => 'woof-one'
+        );
+
+        $this->assertSame( buddypress()->bp_nav['woof'], $expected );
+
+        // Clean up
+        buddypress()->bp_nav = $bp_nav;
+        $this->set_current_user( $old_current_user );
+    }
 }