From d6ffe16606ef95045bdd9d40d7996cbee0a1aab0 Mon Sep 17 00:00:00 2001
From: Konstantin Obenland <obenland@automattic.com>
Date: Mon, 11 Dec 2017 23:32:46 +0000
Subject: [PATCH] Twenty Ten: Use global img contraint for captions

Fixes an incompatibility with the way caption width is set since 4.9, where the caption element would cover the whole content width.

Props slilley, Clorith, hardeepasrani.
Fixes #42604.

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


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

diff --git a/wp-content/themes/twentyten/style.css b/wp-content/themes/twentyten/style.css
index d73dadd075..9012246ce0 100644
--- a/wp-content/themes/twentyten/style.css
+++ b/wp-content/themes/twentyten/style.css
@@ -803,6 +803,8 @@ img.size-full,
 img.size-large,
 img.size-medium,
 .attachment img,
+.entry-content img,
+.wp-caption img,
 .widget-container img {
 	max-width: 100%; /* When images are too wide for containing element, force them to fit. */
 	height: auto; /* Override height to match resized width for correct aspect ratio. */
@@ -837,7 +839,6 @@ img.aligncenter {
 	background: #f1f1f1;
 	line-height: 18px;
 	margin-bottom: 20px;
-	max-width: 632px !important; /* prevent too-wide images from breaking layout */
 	padding: 4px;
 	text-align: center;
 }
diff --git a/wp-includes/version.php b/wp-includes/version.php
index eda548dabe..c25676b90f 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0-alpha-42385';
+$wp_version = '5.0-alpha-42386';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.