Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Navigation Block: Properly decode URL-encoded links #46435

Merged
merged 12 commits into from
Jan 5, 2023
Merged

Navigation Block: Properly decode URL-encoded links #46435

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f1f750c
fix: issue with already encoded urls
kozer Dec 9, 2022
8256ad3
fix: test
kozer Dec 9, 2022
4283088
Merge branch 'WordPress:trunk' into fix_navigation_block_encoded_links
kozer Dec 19, 2022
4ae395e
fix: test
kozer Dec 20, 2022
8150dad
Merge branch 'WordPress:trunk' into fix_navigation_block_encoded_links
kozer Dec 20, 2022
4704426
fix: Always encode a url before saving
kozer Dec 21, 2022
3a29c0e
Try to decode only urls that are encoded
kozer Dec 23, 2022
3505a5f
Merge branch 'WordPress:trunk' into fix_navigation_block_encoded_links
kozer Jan 3, 2023
9430754
change the naming to match WordPress core naming pattern
kozer Jan 3, 2023
4cfabbb
change the naming to match WordPress core naming pattern
kozer Jan 3, 2023
2cb90f0
fix: Fix lint issues
kozer Jan 4, 2023
ddd1f9e
Merge branch 'WordPress:trunk' into fix_navigation_block_encoded_links
kozer Jan 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/block-library/src/navigation-link/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ function render_block_core_navigation_link( $attributes, $content, $block ) {

// Start appending HTML attributes to anchor tag.
if ( isset( $attributes['url'] ) ) {
$html .= ' href="' . esc_url( $attributes['url'] ) . '"';
$html .= ' href="' . esc_url( urldecode( $attributes['url'] ) ) . '"';
}

if ( $is_active ) {
Expand Down
29 changes: 29 additions & 0 deletions phpunit/class-block-library-navigation-link-test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,35 @@ public function test_returns_link_for_plain_link() {
);
}

public function test_returns_link_for_decoded_link() {
$parsed_blocks = parse_blocks(
'<!-- wp:navigation-link {"label":"My Website","url": "https://example.com/?data=lzB%252Fzd%252FZA%253D%253D"} /-->'
);
$this->assertEquals( 1, count( $parsed_blocks ) );

$navigation_link_block = new WP_Block( $parsed_blocks[0], array() );

echo(
render_block_core_navigation_link(
$navigation_link_block->attributes,
array(),
$navigation_link_block
)
);

$this->assertEquals(
true,
strpos(
render_block_core_navigation_link(
kozer marked this conversation as resolved.
Show resolved Hide resolved
$navigation_link_block->attributes,
array(),
$navigation_link_block
),
'https://example.com/?data=lzB%2Fzd%2FZA%3D%3D'
) !== false
);
}

public function test_returns_empty_when_custom_post_type_draft() {
$page_id = self::$custom_draft->ID;

Expand Down