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.

Built from https://develop.svn.wordpress.org/branches/4.7@39654


git-svn-id: http://core.svn.wordpress.org/branches/4.7@39594 1a063a9b-81f0-0310-95a4-ce76da25c4cd

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 ];
 

wp-includes/version.php

@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7.1-alpha-39653';
+$wp_version = '4.7.1-alpha-39654';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.