From 49c7012a7e97c06dbd5c29b1e349e4c57a49e3a4 Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Tue, 23 Feb 2016 01:22:26 +0000
Subject: [PATCH] Customize: Ensure `dynamic_sidebar()` finishes with removing
 the sidebar ID from the `current_dynamic_sidebar_id_stack`.

This ensures that widgets appearing after a nested sidebar will continue to be selective refreshable.

See #27355.

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


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

diff --git a/wp-includes/class-wp-customize-widgets.php b/wp-includes/class-wp-customize-widgets.php
index ca171b2e57..f65e7bfe48 100644
--- a/wp-includes/class-wp-customize-widgets.php
+++ b/wp-includes/class-wp-customize-widgets.php
@@ -1694,6 +1694,7 @@ final class WP_Customize_Widgets {
 	 * @param int|string $index Index, name, or ID of the dynamic sidebar.
 	 */
 	public function end_dynamic_sidebar( $index ) {
+		array_shift( $this->current_dynamic_sidebar_id_stack );
 		if ( ! $this->manager->selective_refresh->is_render_partials_request() ) {
 			printf( "\n<!--dynamic_sidebar_after:%s:%d-->\n", esc_html( $index ), intval( $this->sidebar_instance_count[ $index ] ) );
 		}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index dc2f81e0f4..1335d60b34 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-alpha-36622';
+$wp_version = '4.5-alpha-36623';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.