Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-22 17:18:32 +01:00
Code Issues Projects Releases Wiki Activity

Menus: Respect context when linking to the Customizer.

Browse Source 
`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
This commit is contained in:
Konstantin Obenland 2015-07-07 17:49:24 +00:00
parent ee9cb55e1a
commit 52c2567424
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
wp-admin/nav-menus.php
View File

@ -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

2
wp-includes/version.php
View File

@ -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.