Ticket #43745: 43745.diff

src/wp-includes/canonical.php

@@ -388 +388 @@
                         }
                 }
 
-                $_parsed_query = rawurlencode_deep( $_parsed_query );
+                $_parsed_query = array_combine(
+                        rawurlencode_deep( array_keys( $_parsed_query ) ),
+                        rawurlencode_deep( array_values( $_parsed_query ) )
+                );
                 $redirect_url  = add_query_arg( $_parsed_query, $redirect_url );
         }
 

tests/phpunit/tests/canonical.php

@@ -213 +213 @@
                         // Todo: Endpoints (feeds, trackbacks, etc), More fuzzed mixed query variables, comment paging, Home page (Static)
                 );
         }
+
+        /**
+         * @ticket 43745
+         */
+        public function test_utf8_query_keys_canonical() {
+                $p = self::factory()->post->create(
+                        array(
+                                'post_type'  => 'page',
+                        )
+                );
+                update_option( 'show_on_front', 'page' );
+                update_option( 'page_on_front', $p );
+
+                $this->go_to( get_permalink( $p ) );
+
+                $url = redirect_canonical( add_query_arg( '%D0%BA%D0%BE%D0%BA%D0%BE%D0%BA%D0%BE', 1, site_url( '/' ) ), false );
+                $this->assertNull( $url );
+
+                delete_option( 'page_on_front' );
+        }
 }