Ticket #7349: 7349.ray.patch

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

@@ -61 +61 @@
          * To mimic legacy behavior, if bp_core_create_nav_link() returns false, we make
          * an early exit and don't attempt to register the screen function.
          */
-        if ( false === $nav_item ) {
+        if ( false === $nav_item && ! isset( $r['visibility'] ) ) {
                 return false;
         }
 
@@ -151 +151 @@
                 'default_subnav_slug'     => $r['default_subnav_slug']
         );
 
+        if ( isset( $r['visibility'] ) ) {
+                $nav_item['visibility'] = $r['visibility'];
+        }
+
+        if ( isset( $r['visibility'] ) && false === $r['visibility'] ) {
+                return $nav_item;
+        }
+
         // Add the item to the nav.
         buddypress()->{$component}->nav->add_nav( $nav_item );
 
@@ -226 +234 @@
          * the logged in user is not the displayed user
          * looking at their own profile, don't don't register this screen function.
          */
-        if ( empty( $r['show_for_displayed_user'] ) && ! bp_user_has_access() ) {
+        if ( ! isset( $r['visibility'] ) && empty( $r['show_for_displayed_user'] ) && ! bp_user_has_access() ) {
                 return false;
         }
 

src/bp-core/bp-core-catchuri.php

@@ -670 +670 @@
                 // Error message is displayed with bp_core_no_access_wp_login_error().
                 case 2 :
                         if ( !empty( $redirect ) ) {
-                                bp_core_redirect( add_query_arg( array( 'action' => 'bpnoaccess' ), wp_login_url( $redirect ) ) );
+                                bp_core_redirect( add_query_arg( array(
+                                        'action' => 'bpnoaccess',
+                                        'auth'   => 1
+                                ), wp_login_url( $redirect ) ) );
                         } else {
                                 bp_core_redirect( $root );
                         }
@@ -698 +701 @@
 }
 
 /**
+ * Login redirector.
+ *
+ * If a link is not publicly available, we can send members from external
+ * locations, like following links in an email, through the login screen.
+ *
+ * If a user clicks on this link and is already logged in, we should attempt
+ * to redirect the user to the authorized content instead of forcing the user
+ * to re-authenticate.
+ *
+ * @since 2.9.0
+ */
+function bp_login_redirector() {
+        // Redirect links must include the `redirect_to` and `auth` parameters.
+        if ( empty( $_GET['redirect_to'] ) || empty( $_GET['auth'] ) ) {
+                return;
+        }
+
+        /*
+         * If the user is already logged in,
+         * skip the login form and redirect them to the content.
+         */
+        if ( bp_loggedin_user_id() ) {
+                wp_safe_redirect( esc_url_raw( $_GET['redirect_to'] ) );
+                exit;
+        }
+}
+add_action( 'login_init', 'bp_login_redirector', 1 );
+
+/**
  * Add a custom BuddyPress no access error message to wp-login.php.
  *
  * @since 1.5.0

src/bp-messages/classes/class-bp-messages-component.php

@@ -162 +162 @@
 
                 // Add 'Messages' to the main navigation.
                 $main_nav = array(
-                        'name'                    => $nav_name,
-                        'slug'                    => $slug,
-                        'position'                => 50,
-                        'show_for_displayed_user' => $access,
-                        'screen_function'         => 'messages_screen_inbox',
-                        'default_subnav_slug'     => 'inbox',
-                        'item_css_id'             => $this->id
+                        'name'                => $nav_name,
+                        'slug'                => $slug,
+                        'position'            => 50,
+                        'visibility'          => $access,
+                        'screen_function'     => 'messages_screen_inbox',
+                        'default_subnav_slug' => 'inbox',
+                        'item_css_id'         => $this->id
                 );
 
                 // Add the subnav items to the profile.