Ticket #6325: 6325.03.patch

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

@@ -535 +535 @@
 }
 
 /**
+ * Members user shortlink redirector.
+ *
+ * Redirects x.com/members/me/* to x.com/members/{LOGGED_IN_USER_SLUG}/*
+ *
+ * @since 2.6.0
+ *
+ * @param string $member_slug The current member slug.
+ */
+function bp_core_members_shortlink_redirector( $member_slug ) {
+        /**
+         * Shortlink slug to redirect to logged-in user.
+         *
+         * x.com/members/me/* will redirect to x.com/members/{LOGGED_IN_USER_SLUG}/*
+         *
+         * @since 2.6.0
+         *
+         * @var string $slug Defaults to 'me'.
+         */
+        $me_slug = apply_filters( 'bp_core_members_shortlink_slug', 'me' );
+
+        // Convert to utf-8 for localization.
+        if ( true === function_exists( 'iconv_get_encoding' ) ) {
+                $me_slug = iconv( iconv_get_encoding( 'internal_encoding' ), "UTF-8//TRANSLIT", $me_slug );
+
+        // This might not be accurate...
+        } else {
+                $me_slug = htmlentities( $me_slug, ENT_COMPAT | ENT_HTML401 );
+        }
+
+        // Ensure our custom slug is URL-encoded.
+        $me_slug = html_entity_decode( $me_slug, ENT_COMPAT | ENT_HTML401, 'utf-8' );
+        $me_slug = rawurlencode( $me_slug );
+
+        // Check if we're on our special shortlink slug. If not, bail.
+        if ( $me_slug !== $member_slug ) {
+                return $member_slug;
+        }
+
+        // If logged out, redirect user to login.
+        if ( false === is_user_logged_in() ) {
+                // Add our login redirector hook.
+                add_action( 'template_redirect', 'bp_core_no_access', 0 );
+
+                return $member_slug;
+        }
+
+        $user = wp_get_current_user();
+
+        return bp_core_get_username( $user->ID, $user->user_nicename, $user->user_login );
+}
+add_filter( 'bp_core_set_uri_globals_member_slug', 'bp_core_members_shortlink_redirector' );
+
+/**
  * Catch unauthorized access to certain BuddyPress pages and redirect accordingly.
  *
  * @since 1.5.0

tests/phpunit/testcases/routing/members.php

@@ -108 +108 @@
                 $this->go_to( bp_get_members_directory_permalink() . 'type/foo/' );
                 $this->assertTrue( is_404() );
         }
+
+        /**
+         * @ticket BP6325
+         */
+        function test_custom_member_slug_with_accents_in_shortlink_redirector() {
+                // Emulate our custom slug as seen through bp_core_set_uri_globals().
+                $custom_member_slug = 'regard%C3%A9';
+
+                add_filter( 'bp_core_members_shortlink_slug', array( $this, 'custom_member_slug_with_accents' ) );
+
+                $this->go_to( bp_get_members_directory_permalink() . $custom_member_slug );
+
+                remove_filter( 'bp_core_members_shortlink_slug', array( $this, 'custom_member_slug_with_accents' ) );
+
+                $this->assertSame( get_current_user_id(), bp_displayed_user_id() );
+        }
+
+        /**
+         * @ticket BP6325
+         */
+        function test_custom_member_slug_with_entity_in_shortlink_redirector() {
+                // Emulate our custom slug as seen through bp_core_set_uri_globals().
+                $custom_member_slug = 'regard%C3%A9';
+
+                add_filter( 'bp_core_members_shortlink_slug', array( $this, 'custom_member_slug_with_entities' ) );
+
+                $this->go_to( bp_get_members_directory_permalink() . $custom_member_slug );
+
+                remove_filter( 'bp_core_members_shortlink_slug', array( $this, 'custom_member_slug_with_entities' ) );
+
+                $this->assertSame( get_current_user_id(), bp_displayed_user_id() );
+        }
+
+        function custom_member_slug_with_entities() {
+                return 'regardé';
+        }
+
+        function custom_member_slug_with_accents() {
+                return 'regardé';
+        }
 }