sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Media: Make sure attachment_url_to_postid() performs a case-sensitive search for the uploaded file name.

Browse Source 
Previously, the first available match was returned, regardless of the case, which was not always the expected result.

Props archon810, ben.greeley, tristangemus, vsamoletov, SergeyBiryukov.
Fixes #39768.

git-svn-id: https://develop.svn.wordpress.org/trunk@47010 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2019-12-25 02:24:38 +00:00
parent d56642ea57
commit dbf6a0ba7c
2 changed files with 49 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/wp-includes/media.php
View File

@ -4295,11 +4295,26 @@ function attachment_url_to_postid( $url ) {
} }
$sql = $wpdb->prepare( $sql = $wpdb->prepare(
"SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wp_attached_file' AND meta_value = %s", "SELECT post_id, meta_value FROM $wpdb->postmeta WHERE meta_key = '_wp_attached_file' AND meta_value = %s",
$path $path
); );
$post_id = $wpdb->get_var( $sql ); $results = $wpdb->get_results( $sql );
$post_id = null;
if ( $results ) {
// Use the first available result, but prefer a case-sensitive match, if exists.
$post_id = reset( $results )->post_id;
if ( count( $results ) > 1 ) {
foreach ( $results as $result ) {
if ( $path === $result->meta_value ) {
$post_id = $result->post_id;
break;
}
}
}
}
/** /**
* Filters an attachment id found by URL. * Filters an attachment id found by URL.

36
tests/phpunit/tests/media.php
View File

@ -1058,7 +1058,10 @@ VIDEO;
$this->assertEquals( $attachment_id, attachment_url_to_postid( $image_url ) ); $this->assertEquals( $attachment_id, attachment_url_to_postid( $image_url ) );
} }
function test_attachment_url_to_postid_schemes() { /**
* @ticket 33109
*/
function test_attachment_url_to_postid_with_different_scheme() {
$image_path = '2014/11/' . $this->img_name; $image_path = '2014/11/' . $this->img_name;
$attachment_id = self::factory()->attachment->create_object( $attachment_id = self::factory()->attachment->create_object(
$image_path, $image_path,
@ -1069,13 +1072,38 @@ VIDEO;
) )
); );
/**
* @ticket 33109 Testing protocols not matching
*/
$image_url = 'https://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . $image_path; $image_url = 'https://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . $image_path;
$this->assertEquals( $attachment_id, attachment_url_to_postid( $image_url ) ); $this->assertEquals( $attachment_id, attachment_url_to_postid( $image_url ) );
} }
/**
* @ticket 39768
*/
function test_attachment_url_to_postid_should_be_case_sensitive() {
$image_path_lower_case = '2014/11/' . $this->img_name;
$attachment_id_lower_case = self::factory()->attachment->create_object(
$image_path_lower_case,
0,
array(
'post_mime_type' => 'image/jpeg',
'post_type' => 'attachment',
)
);
$image_path_upper_case = '2014/11/' . ucfirst( $this->img_name );
$attachment_id_upper_case = self::factory()->attachment->create_object(
$image_path_upper_case,
0,
array(
'post_mime_type' => 'image/jpeg',
'post_type' => 'attachment',
)
);
$image_url = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . $image_path_upper_case;
$this->assertEquals( $attachment_id_upper_case, attachment_url_to_postid( $image_url ) );
}
function test_attachment_url_to_postid_filtered() { function test_attachment_url_to_postid_filtered() {
$image_path = '2014/11/' . $this->img_name; $image_path = '2014/11/' . $this->img_name;
$attachment_id = self::factory()->attachment->create_object( $attachment_id = self::factory()->attachment->create_object(