Ticket #3109: 3109-banner-link.diff

api/routes/class-locale-banner.php

@@ -86 +86 @@
                 if ( 'en_US' === $current_locale ) {
                         $current_site = get_site();
 
+                        $referring_path = wp_parse_url( $request->get_header( 'referer' ), PHP_URL_PATH );
+                        if ( $referring_path && '/' === $referring_path[0] )
+                                $current_path = $referring_path;
+                        else
+                                $current_path = $current_site->path;
+
                         // Only one locale suggestion.
                         if ( 1 === count( $suggest_named_locales ) ) {
                                 $locale   = key( $suggest_named_locales );
@@ -109 +115 @@
                                                 sprintf(
                                                         '<a href="https://%s.wordpress.org%s">%s</a>',
                                                         $locale_subdomain_assoc[ $locale ]->subdomain,
-                                                        $current_site->path,
+                                                        esc_url( $current_path ),
                                                         $language
                                                 )
                                         );
@@ -151 +157 @@
                                                 $other_suggest .= sprintf(
                                                         '<a href="https://%s.wordpress.org%s">%s</a>, ',
                                                         $locale_subdomain_assoc[ $locale ]->subdomain,
-                                                        $current_site->path,
+                                                        $esc_url( $current_path ),
                                                         $language
                                                 );
                                         }
@@ -161 +167 @@
                                                 sprintf(
                                                         '<a href="https://%s.wordpress.org%s">%s</a>',
                                                         $locale_subdomain_assoc[ $primary_locale ]->subdomain,
-                                                        $current_site->path,
+                                                        $esc_url( $current_path ),
                                                         $primary_language
                                                 ),
                                                 trim( $other_suggest, ' ,' )