From 52c2567424ea17cd11c369e31263e9cf153b3192 Mon Sep 17 00:00:00 2001
From: Konstantin Obenland <obenland@automattic.com>
Date: Tue, 7 Jul 2015 17:49:24 +0000
Subject: [PATCH] Menus: Respect context when linking to the Customizer.

`Manage in Customizer` will now link to menu locations or the menus panel in
the customizer, depending on whether the user is editing menus or managing
locations.

Props rabmalin for initial patch.
Fixes #32852.


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


git-svn-id: http://core.svn.wordpress.org/trunk@33083 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/nav-menus.php  | 19 +++++++++----------
 wp-includes/version.php |  2 +-
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/wp-admin/nav-menus.php b/wp-admin/nav-menus.php
index b22ac4ba91..5d4070e036 100644
--- a/wp-admin/nav-menus.php
+++ b/wp-admin/nav-menus.php
@@ -562,21 +562,20 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 		<a href="<?php echo admin_url( 'nav-menus.php' ); ?>" class="nav-tab<?php if ( ! isset( $_GET['action'] ) || isset( $_GET['action'] ) && 'locations' != $_GET['action'] ) echo ' nav-tab-active'; ?>"><?php esc_html_e( 'Edit Menus' ); ?></a>
 		<?php if ( $num_locations && $menu_count ) : ?>
 			<a href="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>" class="nav-tab<?php if ( $locations_screen ) echo ' nav-tab-active'; ?>"><?php esc_html_e( 'Manage Locations' ); ?></a>
-		<?php endif; ?>
 		<?php
-			if ( current_user_can( 'customize' ) ) {
+			endif;
+
+			if ( current_user_can( 'customize' ) ) :
+				$focus = $locations_screen ? array( 'section' => 'menu_locations' ) : array( 'panel' => 'nav_menus' );
 				printf(
 					' <a class="page-title-action hide-if-no-customize" href="%1$s">%2$s</a>',
-					esc_url( add_query_arg(
-						array(
-							array( 'autofocus' => array( 'panel' => 'nav_menus' ) ),
-							'return' => urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) )
-						),
-						admin_url( 'customize.php' )
-					) ),
+					esc_url( add_query_arg( array(
+						array( 'autofocus' => $focus ),
+						'return' => urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ),
+					), admin_url( 'customize.php' ) ) ),
 					__( 'Manage in Customizer' )
 				);
-			}
+			endif;
 		?>
 	</h1>
 	<?php
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 1682c67c3c..36417ec814 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-beta1-33111';
+$wp_version = '4.3-beta1-33112';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.