Media: Make sure `attachment_url_to_postid()` performs a case-sensitive search for the uploaded file name.
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. Merges [47010] to the 5.3 branch. Fixes #39768. Built from https://develop.svn.wordpress.org/branches/5.3@47132 git-svn-id: http://core.svn.wordpress.org/branches/5.3@46932 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
e6d839b936
commit
449c2e21f1
|
@ -4255,11 +4255,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.
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
*
|
*
|
||||||
* @global string $wp_version
|
* @global string $wp_version
|
||||||
*/
|
*/
|
||||||
$wp_version = '5.3.3-alpha-47131';
|
$wp_version = '5.3.3-alpha-47132';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||||
|
|
Loading…
Reference in New Issue