From 1ddd9cad9bee0522cea39ab95dbf5a9ce3bfcc14 Mon Sep 17 00:00:00 2001
From: "Dominik Schilling (ocean90)" <ocean90@git.wordpress.org>
Date: Wed, 11 Feb 2015 20:56:21 +0000
Subject: [PATCH] Widgets: Add return param for widgets admin page to the
 "Manage in Customizer" link.

props tywayne.
fixes #30888.

git-svn-id: https://develop.svn.wordpress.org/trunk@31420 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/widgets.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/wp-admin/widgets.php b/src/wp-admin/widgets.php
index ae471a0a63..604a369dc2 100644
--- a/src/wp-admin/widgets.php
+++ b/src/wp-admin/widgets.php
@@ -316,7 +316,13 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
 	if ( current_user_can( 'customize' ) ) {
 		printf(
 			' <a class="add-new-h2 hide-if-no-customize" href="%1$s">%2$s</a>',
-			admin_url( 'customize.php?autofocus[panel]=widgets' ),
+			esc_url( add_query_arg(
+				array(
+					array( 'autofocus' => array( 'panel' => 'widgets' ) ),
+					'return' => urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) )
+				),
+				admin_url( 'customize.php' )
+			) ),
 			__( 'Manage in Customizer' )
 		);
 	}