Changeset 30501

Timestamp:

11/21/2014 06:34:23 AM (10 years ago)

Author:

SergeyBiryukov

Message:

Replace invalid use of ltrim() in attachment_url_to_postid() with substr().

props bradyvercher.
fixes #30346.

Location:

trunk

Files:

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

trunk/src/wp-includes/media.php

@@ -3270 +3270 @@
 
     $dir = wp_upload_dir();
-    $path = ltrim( $url, $dir['baseurl'] . '/' );
+    $path = $url;
+
+    if ( 0 === strpos( $path, $dir['baseurl'] . '/' ) ) {
+        $path = substr( $path, strlen( $dir['baseurl'] . '/' ) );
+    }
 
     $sql = $wpdb->prepare(

trunk/tests/phpunit/tests/media.php

@@ -444 +444 @@
     }
 
+    /**
+     * @ticket 30346
+     */
+    function test_attachment_url_to_postid() {
+        $image_path = '2014/11/' . $this->img_name;
+        $attachment_id = $this->factory->attachment->create_object( $image_path, 0, array(
+            'post_mime_type' => 'image/jpeg',
+            'post_type'      => 'attachment',
+        ) );
+
+        $image_url  = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . $image_path;
+        $this->assertEquals( $attachment_id, attachment_url_to_postid( $image_url ) );
+
+        add_filter( 'upload_dir', array( $this, '_upload_dir' ) );
+        $image_url = 'http://192.168.1.20.com/wp-content/uploads/' . $image_path;
+        $this->assertEquals( $attachment_id, attachment_url_to_postid( $image_url ) );
+        remove_filter( 'upload_dir', array( $this, '_upload_dir' ) );
+    }
+
+    function _upload_dir( $dir ) {
+        $dir['baseurl'] = 'http://192.168.1.20.com/wp-content/uploads';
+        return $dir;
+    }
+
 }