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

Timestamp:

01/02/2016 03:53:21 AM (10 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/media.php (modified) (4 diffs)

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

@@ -879 +879 @@
 
 /**
+ * Get the attachment path relative to the upload directory.
+ *
+ * @since 4.4.1
+ * @access private
+ *
+ * @param string $file Attachment file name.
+ * @return string Attachment path relative to the upload directory.
+ */
+function _wp_get_attachment_relative_path( $file ) {
+    $dirname = dirname( $file );
+
+    if ( '.' === $dirname ) {
+        return '';
+    }
+
+    if ( false !== strpos( $dirname, 'wp-content/uploads' ) ) {
+        // Get the directory name relative to the upload directory (back compat for pre-2.7 uploads)
+        $dirname = substr( $dirname, strpos( $dirname, 'wp-content/uploads' ) + 18 );
+        $dirname = ltrim( $dirname, '/' );
+    }
+
+    return $dirname;
+}
+
+/**
  * Caches and returns the base URL of the uploads directory.
  *
@@ -1007 +1032 @@
     // Uploads are (or have been) in year/month sub-directories.
     if ( $image_basename !== $image_meta['file'] ) {
-        $dirname = dirname( $image_meta['file'] );
-
-        if ( $dirname !== '.' ) {
+        $dirname = _wp_get_attachment_relative_path( $image_meta['file'] );
+
+        if ( $dirname ) {
             $image_baseurl = trailingslashit( $image_baseurl ) . $dirname;
         }
@@ -1287 +1312 @@
     $image_base_url = $base_url;
 
-    $dirname = dirname( $image_meta['file'] );
-    if ( $dirname !== '.' ) {
+    $dirname = _wp_get_attachment_relative_path( $image_meta['file'] );
+    if ( $dirname ) {
         $image_base_url .= trailingslashit( $dirname );
     }
@@ -1299 +1324 @@
 
     // Add the original image.
-    $all_sizes[] = $base_url . $image_meta['file'];
+    $all_sizes[] = $image_base_url . basename( $image_meta['file'] );
 
     // Bail early if the image src doesn't match any of the known image sizes.