Changeset 47132

Timestamp:

01/29/2020 04:34:45 PM (5 years ago)

Author:

SergeyBiryukov

Message:

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.

Location:

branches/5.3

Files:

• . (modified) (1 prop)
• src/wp-includes/media.php (modified) (1 diff)
• tests/phpunit/tests/media.php (modified) (2 diffs)

branches/5.3/src/wp-includes/media.php

@@ -4256 +4256 @@
 
     $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
     );
 
-    $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;
+                }
+            }
+        }
+    }
 
     /**

branches/5.3/tests/phpunit/tests/media.php

@@ -1059 +1059 @@
     }
 
-    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;
         $attachment_id = self::factory()->attachment->create_object(
@@ -1070 +1073 @@
         );
 
-        /**
-         * @ticket 33109 Testing protocols not matching
-         */
         $image_url = 'https://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . $image_path;
         $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 ) );
     }