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

MERL-1228: Fix issue with rewriting links to front end #1603

Closed
wants to merge 7 commits into from
Closed

MERL-1228: Fix issue with rewriting links to front end #1603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
77daf35
fix: do not rewrite links to files in post content when image replace…
mindctrl Oct 11, 2023
866d057
test: confirm behavior of image and URL replacement
mindctrl Oct 11, 2023
fd7b42c
chore: add changeset
mindctrl Oct 11, 2023
5f78edc
Merge branch 'canary' into merl-1228_link-rewrites
mindctrl Oct 11, 2023
7aad5f4
Merge branch 'canary' into merl-1228_link-rewrites
mindctrl Oct 11, 2023
76f88d7
Merge branch 'canary' into merl-1228_link-rewrites
mindctrl Oct 12, 2023
729f6ee
chore: coding standards
mindctrl Oct 12, 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
5 changes: 5 additions & 0 deletions .changeset/plenty-lamps-confess.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@faustwp/wordpress-plugin': patch
---

Fixed issue where file links were rewritten to the front-end domain when they should not have been.
8 changes: 6 additions & 2 deletions plugins/faustwp/includes/replacement/callbacks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,16 @@ function content_replacement( $content ) {
$replacement = '/';
}

$content = str_replace( "href=\"{$site_url}", "href=\"{$replacement}", $content );
if ( ! is_image_source_replacement_enabled() ) {
$upload_dir = str_replace( $site_url, '', wp_upload_dir()['baseurl'] );
$content = preg_replace( "#href=\"{$site_url}(?!{$upload_dir})#", "href=\"{$replacement}", $content );
} else {
$content = str_replace( "href=\"{$site_url}", "href=\"{$replacement}", $content );
}

return str_replace( 'href="//', 'href="/', $content );
}

add_filter( 'the_content', __NAMESPACE__ . '\\image_source_replacement' );
/**
* Callback for WordPress 'the_content' filter to replace paths to media.
*
Expand Down
31 changes: 30 additions & 1 deletion plugins/faustwp/tests/integration/ReplacementCallbacksTests.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,33 @@ public function test_content_replacement_does_not_filter_content_when_content_re
public function test_content_replacement_filters_content_when_content_replacement_enabled() {
faustwp_update_setting( 'frontend_uri', 'http://moo' );
add_filter( 'faustwp_domain_replacement_enabled', '__return_true' );
$this->assertSame( '<a href="http://moo">moo</a>', content_replacement( '<a href="http://example.org">moo</a>' ) );
$this->assertSame(
'<a href="http://moo">moo</a>',
content_replacement( '<a href="http://example.org">moo</a>' )
);

$this->assertSame(
'<a href="http://moo/?p=1">Hi</a>',
content_replacement( '<a href="http://example.org/?p=1">Hi</a>' )
);

$this->assertSame(
'<a href="http://moo/posts/hello-world">Hello World</a>',
content_replacement( '<a href="http://example.org/posts/hello-world">Hello World</a>' )
);

faustwp_update_setting( 'frontend_uri', null );
remove_filter( 'faustwp_domain_replacement_enabled', '__return_true' );
}

public function test_content_replacement_does_not_filter_wp_upload_dir_link() {
faustwp_update_setting( 'frontend_uri', 'http://moo' );
add_filter( 'faustwp_domain_replacement_enabled', '__return_true' );
$content = '<a href="http://example.org/wp-content/uploads/file.pdf">Download</a>. http://example.org/wp-content/uploads/file.pdf';
$this->assertSame(
$content,
content_replacement( $content )
);
faustwp_update_setting( 'frontend_uri', null );
remove_filter( 'faustwp_domain_replacement_enabled', '__return_true' );
}
Expand All @@ -98,6 +124,9 @@ public function test_image_source_replacement_filters_content_when_image_replace
# Do replace exact domain match
$this->assertSame( '<img src="http://example.org/image.png">', image_source_replacement( '<img src="http://foo.co/image.png">' ) );
$this->assertSame( '<img src="http://example.org/image.png">', image_source_replacement( '<img src="/image.png">' ) );

// Ensure unrelated domains are left alone.
$this->assertSame( '<img src="http://fake/image.png">', image_source_replacement( '<img src="http://fake/image.png">' ) );
faustwp_update_setting( 'frontend_uri', null );
faustwp_update_setting( 'enable_image_source', '0' );
}
Expand Down
Loading