Ticket #7840: 7840.pushState.patch

src/bp-templates/bp-nouveau/includes/messages/functions.php

@@ -114 +114 @@
                         'one'  => __( '(and 1 other)', 'buddypress' ),
                         'more' => __( '(and %d others)', 'buddypress' ),
                 ),
+                'rootUrl' => trailingslashit( str_replace( home_url(), '', bp_displayed_user_domain() ) . bp_get_messages_slug() ),
         );
 
         // Star private messages.
@@ -179 +180 @@
                 if ( 'notices' === $secondary_nav_item->slug ) {
                         bp_core_remove_subnav_item( bp_get_messages_slug(), $secondary_nav_item->slug, 'members' );
                 } else {
-                        $params = array( 'link' => '#' . $secondary_nav_item->slug );
+                        $params = array( 'link' => trailingslashit( $secondary_nav_item->link ) . $secondary_nav_item->slug );
 
                         // Make sure Admins won't write a messages from the user's account.
                         if ( 'compose' === $secondary_nav_item->slug ) {
@@ -208 +209 @@
                         if ( 'notices' === $nav_id ) {
                                 $admin_nav[ $nav_iterator ]['href'] = esc_url( add_query_arg( array( 'page' => 'bp-notices' ), bp_get_admin_url( 'users.php' ) ) );
                         } else {
-                                $admin_nav[ $nav_iterator ]['href'] = $user_messages_link . '#' . trim( $nav_id );
+                                $admin_nav[ $nav_iterator ]['href'] = trailingslashit( $user_messages_link ) . trim( $nav_id );
                         }
                 }
         }
@@ -444 +445 @@
                 )
         );
 }
+
+/**
+ * Avoid canonical redirects for the User's private message screens
+ *
+ * @since  3.0.1
+ *
+ * @param  boolean $redirect True to redirect to canonical url. False otherwise.
+ * @return boolean           True to redirect to canonical url. False otherwise.
+ */
+function bp_nouveau_messages_no_canonical_redirect( $redirect = true ) {
+        if ( bp_is_user() && bp_is_current_component( 'messages' ) ) {
+                $redirect = false;
+        }
+
+        return $redirect;
+}

src/bp-templates/bp-nouveau/includes/messages/loader.php

@@ -103 +103 @@
 
                 // Messages
                 add_filter( 'bp_messages_admin_nav', 'bp_nouveau_messages_adjust_admin_nav', 10, 1 );
+                add_filter( 'bp_do_redirect_canonical', 'bp_nouveau_messages_no_canonical_redirect', 10, 1 );
         }
 }
 

src/bp-templates/bp-nouveau/js/buddypress-messages.js

@@ -37 +37 @@
 
                         this.setupNav();
 
-                        Backbone.history.start();
+                        Backbone.history.start( {
+                                pushState: true,
+                                root: BP_Nouveau.messages.rootUrl
+                        } );
                 },
 
                 setupNav: function() {