Fix url escaping for array parameters in Navigation links (#58068)

* fix escaping URLs in navigation links * add test case * undo the class suffix remove in test setup
WordPress · Jan 31, 2024 · eab51ec · eab51ec
1 parent 46fec08
commit eab51ec
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/packages/block-library/src/navigation-link/index.php b/packages/block-library/src/navigation-link/index.php
@@ -132,6 +132,10 @@ function block_core_navigation_link_maybe_urldecode( $url ) {
 	$query_params   = wp_parse_args( $query );
 
 	foreach ( $query_params as $query_param ) {
+		$can_query_param_be_encoded = is_string( $query_param ) && ! empty( $query_param );
+		if ( ! $can_query_param_be_encoded ) {
+			continue;
+		}
 		if ( rawurldecode( $query_param ) !== $query_param ) {
 			$is_url_encoded = true;
 			break;

diff --git a/phpunit/class-block-library-navigation-link-test.php b/phpunit/class-block-library-navigation-link-test.php
@@ -222,12 +222,14 @@ public function test_returns_link_for_decoded_link() {
 			'https://example.com/?id=10&data=lzB%252Fzd%252FZA%253D%253D',
 			'https://example.com/?id=10&data=lzB%2Fzd%FZA%3D%3D',
 			'https://example.com/?id=10&data=1234',
+			'https://example.com/?arrayParams[]=1&arrayParams[]=2&arrayParams[]=3',
 		);
 
 		$urls_after_render = array(
 			'https://example.com/?id=10&#038;data=lzB%2Fzd%2FZA%3D%3D',
 			'https://example.com/?id=10&#038;data=lzB%2Fzd%FZA%3D%3D',
 			'https://example.com/?id=10&#038;data=1234',
+			'https://example.com/?arrayParams%5B%5D=1&#038;arrayParams%5B%5D=2&#038;arrayParams%5B%5D=3',
 		);
 
 		foreach ( $urls_before_render as $idx => $link ) {