Changeset 39654 for branches/4.7

Timestamp:

12/30/2016 06:23:56 AM (8 years ago)

Author:

dd32

Message:

Media: Move a variable definition outside of conditionals to ensure it's always available.
This fixes cases where the URL to a PDF preview may be incorrectly calculated when no thumbnails were generated for the PDF (and avoids a PHP Notice at the same time).

Merges [39612] to the 4.7 branch.
Fixes #39250.

Location:

branches/4.7

Files:

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

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

@@ -3064 +3064 @@
 
     $attachment_url = wp_get_attachment_url( $attachment->ID );
+    $base_url = str_replace( wp_basename( $attachment_url ), '', $attachment_url );
 
     $response = array(
@@ -3171 +3172 @@
                 );
             } elseif ( isset( $meta['sizes'][ $size ] ) ) {
-                if ( ! isset( $base_url ) )
-                    $base_url = str_replace( wp_basename( $attachment_url ), '', $attachment_url );
-
                 // Nothing from the filter, so consult image metadata if we have it.
                 $size_meta = $meta['sizes'][ $size ];