Skip to content

Media: Use unique placeholders during export #861

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

Open
MaggieCabrera wants to merge 1 commit into
base: trunk
Choose a base branch
from
+28 −2
Open

Media: Use unique placeholders during export #861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions includes/create-theme/theme-media.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,8 +462,12 @@ public static function make_template_images_local( $template, $media_to_localize
// but accepts a leading `/` unchanged. The path uses characters
// that wp_json_encode leaves untouched as well.
$placeholders = array();
$next_placeholder = static function ( $raw ) use ( &$placeholders ) {
$id = '/__cbt-local-media-' . count( $placeholders ) . '__';
$source_content = $template->content;
$next_placeholder = static function ( $raw ) use ( &$placeholders, $source_content ) {
do {
$id = '/__cbt-local-media-' . wp_generate_uuid4() . '-' . count( $placeholders ) . '__/';
} while ( false !== strpos( $source_content, $id ) || isset( $placeholders[ $id ] ) );

$placeholders[ $id ] = $raw;
return $id;
};
Expand Down
22 changes: 22 additions & 0 deletions tests/test-theme-media.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,28 @@ public function test_make_template_images_local_only_rewrites_validated_media()
$this->assertStringNotContainsString( '/assets/images/not-copied.png', $new_template->content );
}

public function test_make_template_images_local_preserves_placeholder_like_content() {
$template = new stdClass();
$template->content = '
<!-- wp:paragraph {"metadata":{"name":"/__cbt-local-media-0__/"}} -->
<p>Keep /__cbt-local-media-0__/ unchanged.</p>
<!-- /wp:paragraph -->
<!-- wp:image -->
<figure class="wp-block-image"><img src="http://example.com/copied.png" alt="" /></figure>
<!-- /wp:image -->
';

$new_template = CBT_Theme_Media::make_template_images_local(
$template,
array( 'http://example.com/copied.png' )
);

$this->assertStringContainsString( '"name":"/__cbt-local-media-0__/"', $new_template->content );
$this->assertStringContainsString( 'Keep /__cbt-local-media-0__/ unchanged.', $new_template->content );
$this->assertStringContainsString( '/assets/images/copied.png', $new_template->content );
$this->assertStringNotContainsString( '__cbt-local-media-', str_replace( '/__cbt-local-media-0__/', '', $new_template->content ) );
}

public function test_prepare_template_for_export_leaves_unvalidated_media_remote() {
$template = new stdClass();
$template->slug = 'test-template';
Expand Down
Loading