WordPress 4.7.1-scripts

[autoinstalls/wordpress.git] / wp-includes / media.php

diff --git a/wp-includes/media.php b/wp-includes/media.php
index ba52555932c1861aaf933b025bf723abada8b9d8..deb18a40b6ecec7170ad82ec36782beedc7ceaa1 100644 (file)
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -3063,6 +3063,7 @@ function wp_prepare_attachment_for_js( $attachment ) {
                list( $type, $subtype ) = array( $attachment->post_mime_type, '' );
 
        $attachment_url = wp_get_attachment_url( $attachment->ID );
+       $base_url = str_replace( wp_basename( $attachment_url ), '', $attachment_url );
 
        $response = array(
                'id'          => $attachment->ID,
@@ -3170,9 +3171,6 @@ function wp_prepare_attachment_for_js( $attachment ) {
                                        'orientation' => $downsize[2] > $downsize[1] ? 'portrait' : 'landscape',
                                );
                        } 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 ];