Changeset 36151 for branches/4.4/src/wp-includes/post.php

Timestamp:

01/02/2016 03:53:21 AM (9 years ago)

Author:

dd32

Message:

Responsive images: add compatibility for versions < 2.7 when the full image path was stored in the metadata. Introduces _wp_get_attachment_relative_path() and uses it in wp_get_attachment_url().

Merges [36120] to the 4.4 branch.
Props dd32, SergeyBiryukov.
Fixes #35106.

Location:

branches/4.4

Files:

• . (modified) (1 prop)
• src/wp-includes/post.php (modified) (1 diff)

branches/4.4/src/wp-includes/post.php

@@ -4870 +4870 @@
                 $url = str_replace($uploads['basedir'], $uploads['baseurl'], $file);
             } elseif ( false !== strpos($file, 'wp-content/uploads') ) {
-                $url = $uploads['baseurl'] . substr( $file, strpos($file, 'wp-content/uploads') + 18 );
+                // Get the directory name relative to the basedir (back compat for pre-2.7 uploads)
+                $url = trailingslashit( $uploads['baseurl'] . '/' . _wp_get_attachment_relative_path( $file ) ) . basename( $file );
             } else {
                 // It's a newly-uploaded file, therefore $file is relative to the basedir.