Skip to content

Preserve self-closing block notation when rewriting URLs #226

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

Merged
merged 3 commits into from
Oct 10, 2025
Merged

Preserve self-closing block notation when rewriting URLs #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf80b3c
Preserve self-closing block notation when rewriting URLs
adamziel Oct 10, 2025
f4089d3
Merge branch 'master' into backport-preserving-self-closing-blocks
adamziel Oct 10, 2025
9e39ae8
Adjust one last failing test
adamziel Oct 10, 2025
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
3 changes: 3 additions & 0 deletions e2e/fixtures/wxr-simple.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@
<p>Two roads diverged in a yellow wood,<br>And sorry I could not travel both</p>
<!-- /wp:paragraph -->

<!-- Test if self-closing blocks remain self-closing after URL rewriting. -->
<!-- wp:navigation-link {"url":"https://playground.internal/path/one"} /-->

<!-- wp:paragraph -->
<p>
<a href="https://playground.internal/path/one">One</a> seemed great, but <a href="https://playground.internal/path-not-taken">the other</a> seemed great too.
Expand Down
6 changes: 6 additions & 0 deletions e2e/import-wxr.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ PARSERS.forEach((parser) => {
<p>Two roads diverged in a yellow wood,<br>And sorry I could not travel both</p>
<!-- /wp:paragraph -->

<!-- Test if self-closing blocks remain self-closing after URL rewriting. -->
<!-- wp:navigation-link {"url":"${PLAYGROUND_URL}/one"} /-->

<!-- wp:paragraph -->
<p>
<a href="${PLAYGROUND_URL}/one">One</a> seemed great, but <a href="https://playground.internal/path-not-taken">the other</a> seemed great too.
Expand Down Expand Up @@ -213,6 +216,9 @@ test.describe('General tests', () => {
<p>Two roads diverged in a yellow wood,<br>And sorry I could not travel both</p>
<!-- /wp:paragraph -->

<!-- Test if self-closing blocks remain self-closing after URL rewriting. -->
<!-- wp:navigation-link {\"url\":\"https://playground.internal/path/one\"} /-->

<!-- wp:paragraph -->
<p>
<a href="https://playground.internal/path/one">One</a> seemed great, but <a href="https://playground.internal/path-not-taken">the other</a> seemed great too.
Expand Down
3 changes: 2 additions & 1 deletion src/php-toolkit/DataLiberation/BlockMarkup/class-blockmarkupprocessor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,8 @@ private function block_attribute_updates_to_modifiable_text_updates() {
' ' .
$this->block_name .
' ' .
$encoded_attributes
$encoded_attributes .
( $this->is_self_closing_block() ? '/' : '' )
);

return true;
Expand Down