From a017516291e6d2fd216bb86cb95bac36bae8a7e5 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Mon, 22 Aug 2016 20:53:29 +0000
Subject: [PATCH] Media: remove unnecessary variable assignment in
 `gallery_shortcode()`.

See #37771.

Built from https://develop.svn.wordpress.org/trunk@38309


git-svn-id: http://core.svn.wordpress.org/trunk@38250 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/media.php   | 4 ++--
 wp-includes/version.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-includes/media.php b/wp-includes/media.php
index 294779bdce..d5d3d77d04 100644
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -1565,10 +1565,10 @@ function img_caption_shortcode( $attr, $content = null ) {
 	$caption_width = apply_filters( 'img_caption_shortcode_width', $width, $atts, $content );
 
 	$style = '';
-	if ( $caption_width )
+	if ( $caption_width ) {
 		$style = 'style="width: ' . (int) $caption_width . 'px" ';
+	}
 
-	$html = '';
 	if ( $html5 ) {
 		$html = '<figure ' . $atts['id'] . $style . 'class="' . esc_attr( $class ) . '">'
 		. do_shortcode( $content ) . '<figcaption class="wp-caption-text">' . $atts['caption'] . '</figcaption></figure>';
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 830e150343..30f721231a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-alpha-38308';
+$wp_version = '4.7-alpha-38309';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.