From d22adb0d6eac4391cfc9d3b46947e12866323a2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Helen=20Hou-Sand=C3=AD?= <helen.y.hou@gmail.com>
Date: Wed, 29 Jul 2015 17:59:24 +0000
Subject: [PATCH] Ensure the caption shortcode outputs a valid HTML ID.

fixes #33179.

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


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

diff --git a/wp-includes/media.php b/wp-includes/media.php
index d4b43494c7..95bbca732e 100644
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -896,7 +896,7 @@ function img_caption_shortcode( $attr, $content = null ) {
 		return $content;
 
 	if ( ! empty( $atts['id'] ) )
-		$atts['id'] = 'id="' . esc_attr( $atts['id'] ) . '" ';
+		$atts['id'] = 'id="' . esc_attr( sanitize_html_class( $atts['id'] ) ) . '" ';
 
 	$class = trim( 'wp-caption ' . $atts['align'] . ' ' . $atts['class'] );
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index bcb834a646..ccba7b4ef6 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-beta4-33488';
+$wp_version = '4.3-beta4-33489';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.