WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Nav menus: Restore menu id in hidden input. 

`wp-admin/js/nav-menu.js` uses the value as context for quick searches and when
adding menu items.

Reverts [32695], see #31816.
Fixes #32699.


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


git-svn-id: http://core.svn.wordpress.org/trunk@33133 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Konstantin Obenland 2015-07-11 06:11:24 +00:00
parent 0dbe4d6c95
commit 0a64d94562
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -655,7 +655,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
<form method="get" action="<?php echo admin_url( 'nav-menus.php' ); ?>"> <form method="get" action="<?php echo admin_url( 'nav-menus.php' ); ?>">
<input type="hidden" name="action" value="edit" /> <input type="hidden" name="action" value="edit" />
<label for="menu" class="selected-menu"><?php _e( 'Select a menu to edit:' ); ?></label> <label for="menu" class="selected-menu"><?php _e( 'Select a menu to edit:' ); ?></label>
<select name="menu" id="menu"> <select name="menu">
<?php if ( $add_new_screen ) : ?> <?php if ( $add_new_screen ) : ?>
<option value="0" selected="selected"><?php _e( '&mdash; Select &mdash;' ); ?></option> <option value="0" selected="selected"><?php _e( '&mdash; Select &mdash;' ); ?></option>
<?php endif; ?> <?php endif; ?>
@ -726,7 +726,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
<input type="hidden" name="zero-menu-state" value="true" /> <input type="hidden" name="zero-menu-state" value="true" />
<?php } ?> <?php } ?>
<input type="hidden" name="action" value="update" /> <input type="hidden" name="action" value="update" />
<input type="hidden" name="menu" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" /> <input type="hidden" name="menu" id="menu" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
<div id="nav-menu-header"> <div id="nav-menu-header">
<div class="major-publishing-actions"> <div class="major-publishing-actions">
<label class="menu-name-label howto open-label" for="menu-name"> <label class="menu-name-label howto open-label" for="menu-name">

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.3-beta2-33160'; $wp_version = '4.3-beta2-33161';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.