--- a/wp/wp-admin/includes/nav-menu.php Mon Jun 08 16:11:51 2015 +0000
+++ b/wp/wp-admin/includes/nav-menu.php Tue Jun 09 03:35:32 2015 +0200
@@ -19,7 +19,7 @@
* @param int $depth Depth of menu item. Used for padding.
* @param array $args Not used.
*/
- function start_lvl( &$output, $depth = 0, $args = array() ) {}
+ public function start_lvl( &$output, $depth = 0, $args = array() ) {}
/**
* Ends the list of after the elements are added.
@@ -32,7 +32,7 @@
* @param int $depth Depth of menu item. Used for padding.
* @param array $args Not used.
*/
- function end_lvl( &$output, $depth = 0, $args = array() ) {}
+ public function end_lvl( &$output, $depth = 0, $args = array() ) {}
/**
* Start the element output.
@@ -46,7 +46,7 @@
* @param array $args Not used.
* @param int $id Not used.
*/
- function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) {
+ public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) {
global $_wp_nav_menu_max_depth;
$_wp_nav_menu_max_depth = $depth > $_wp_nav_menu_max_depth ? $depth : $_wp_nav_menu_max_depth;
@@ -186,11 +186,11 @@
<p class="field-move hide-if-no-js description description-wide">
<label>
<span><?php _e( 'Move' ); ?></span>
- <a href="#" class="menus-move-up"><?php _e( 'Up one' ); ?></a>
- <a href="#" class="menus-move-down"><?php _e( 'Down one' ); ?></a>
- <a href="#" class="menus-move-left"></a>
- <a href="#" class="menus-move-right"></a>
- <a href="#" class="menus-move-top"><?php _e( 'To the top' ); ?></a>
+ <a href="#" class="menus-move menus-move-up" data-dir="up"><?php _e( 'Up one' ); ?></a>
+ <a href="#" class="menus-move menus-move-down" data-dir="down"><?php _e( 'Down one' ); ?></a>
+ <a href="#" class="menus-move menus-move-left" data-dir="left"></a>
+ <a href="#" class="menus-move menus-move-right" data-dir="right"></a>
+ <a href="#" class="menus-move menus-move-top" data-dir="top"><?php _e( 'To the top' ); ?></a>
</label>
</p>
@@ -231,12 +231,11 @@
/**
* Create HTML list of nav menu input items.
*
- * @package WordPress
* @since 3.0.0
* @uses Walker_Nav_Menu
*/
class Walker_Nav_Menu_Checklist extends Walker_Nav_Menu {
- function __construct( $fields = false ) {
+ public function __construct( $fields = false ) {
if ( $fields ) {
$this->db_fields = $fields;
}
@@ -253,7 +252,7 @@
* @param int $depth Depth of page. Used for padding.
* @param array $args Not used.
*/
- function start_lvl( &$output, $depth = 0, $args = array() ) {
+ public function start_lvl( &$output, $depth = 0, $args = array() ) {
$indent = str_repeat( "\t", $depth );
$output .= "\n$indent<ul class='children'>\n";
}
@@ -269,7 +268,7 @@
* @param int $depth Depth of page. Used for padding.
* @param array $args Not used.
*/
- function end_lvl( &$output, $depth = 0, $args = array() ) {
+ public function end_lvl( &$output, $depth = 0, $args = array() ) {
$indent = str_repeat( "\t", $depth );
$output .= "\n$indent</ul>";
}
@@ -287,7 +286,7 @@
* @param array $args Not used.
* @param int $id Not used.
*/
- function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) {
+ public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) {
global $_nav_menu_placeholder;
$_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval($_nav_menu_placeholder) - 1 : -1;
@@ -357,8 +356,7 @@
if ( 'markup' == $response_format ) {
echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( get_post( $object_id ) ) ), 0, (object) $args );
} elseif ( 'json' == $response_format ) {
- $post_obj = get_post( $object_id );
- echo json_encode(
+ echo wp_json_encode(
array(
'ID' => $object_id,
'post_title' => get_the_title( $object_id ),
@@ -375,7 +373,7 @@
echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( get_term( $object_id, $object_type ) ) ), 0, (object) $args );
} elseif ( 'json' == $response_format ) {
$post_obj = get_term( $object_id, $object_type );
- echo json_encode(
+ echo wp_json_encode(
array(
'ID' => $object_id,
'post_title' => $post_obj->name,
@@ -403,7 +401,7 @@
$var_by_ref = get_the_ID();
echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( get_post( $var_by_ref ) ) ), 0, (object) $args );
} elseif ( 'json' == $response_format ) {
- echo json_encode(
+ echo wp_json_encode(
array(
'ID' => get_the_ID(),
'post_title' => get_the_title(),
@@ -424,7 +422,7 @@
if ( 'markup' == $response_format ) {
echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( $term ) ), 0, (object) $args );
} elseif ( 'json' == $response_format ) {
- echo json_encode(
+ echo wp_json_encode(
array(
'ID' => $term->term_id,
'post_title' => $term->name,
@@ -446,7 +444,7 @@
function wp_nav_menu_setup() {
// Register meta boxes
wp_nav_menu_post_type_meta_boxes();
- add_meta_box( 'add-custom-links', __( 'Links' ), 'wp_nav_menu_item_link_meta_box', 'nav-menus', 'side', 'default' );
+ add_meta_box( 'add-custom-links', __( 'Custom Links' ), 'wp_nav_menu_item_link_meta_box', 'nav-menus', 'side', 'default' );
wp_nav_menu_taxonomy_meta_boxes();
// Register advanced menu items (columns)
@@ -503,10 +501,22 @@
return;
foreach ( $post_types as $post_type ) {
+ /**
+ * Filter whether a menu items meta box will be added for the current
+ * object type.
+ *
+ * If a falsey value is returned instead of an object, the menu items
+ * meta box for the current meta box object will not be added.
+ *
+ * @since 3.0.0
+ *
+ * @param object $meta_box_object The current object to add a menu items
+ * meta box for.
+ */
$post_type = apply_filters( 'nav_menu_meta_box_object', $post_type );
if ( $post_type ) {
$id = $post_type->name;
- // give pages a higher priority
+ // Give pages a higher priority.
$priority = ( 'page' == $post_type->name ? 'core' : 'default' );
add_meta_box( "add-{$id}", $post_type->labels->name, 'wp_nav_menu_item_post_type_meta_box', 'nav-menus', 'side', $priority, $post_type );
}
@@ -525,6 +535,7 @@
return;
foreach ( $taxonomies as $tax ) {
+ /** This filter is documented in wp-admin/includes/nav-menu.php */
$tax = apply_filters( 'nav_menu_meta_box_object', $tax );
if ( $tax ) {
$id = $tax->name;
@@ -539,7 +550,6 @@
* @since 3.6.0
*
* @uses global $one_theme_location_no_menus to determine if no menus exist
- * @uses disabled() to output the disabled attribute in $other_attributes param in submit_button()
*
* @param int|string $nav_menu_selected_id (id, name or slug) of the currently-selected menu
* @return string Disabled attribute if at least one menu exists, false if not
@@ -604,7 +614,7 @@
$post_type_name = $post_type['args']->name;
- // paginate browsing for large numbers of post objects
+ // Paginate browsing for large numbers of post objects.
$per_page = 50;
$pagenum = isset( $_REQUEST[$post_type_name . '-tab'] ) && isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1;
$offset = 0 < $pagenum ? $per_page * ( $pagenum - 1 ) : 0;
@@ -631,8 +641,6 @@
return;
}
- $post_type_object = get_post_type_object($post_type_name);
-
$num_pages = $get_posts->max_num_pages;
$page_links = paginate_links( array(
@@ -651,9 +659,6 @@
'current' => $pagenum
));
- if ( !$posts )
- $error = '<li id="error">'. $post_type['args']->labels->not_found .'</li>';
-
$db_fields = false;
if ( is_post_type_hierarchical( $post_type_name ) ) {
$db_fields = array( 'parent' => 'post_parent', 'id' => 'ID' );
@@ -756,7 +761,10 @@
<?php
$args['walker'] = $walker;
- // if we're dealing with pages, let's put a checkbox for the front page at the top of the list
+ /*
+ * If we're dealing with pages, let's put a checkbox for the front
+ * page at the top of the list.
+ */
if ( 'page' == $post_type_name ) {
$front_page = 'page' == get_option('show_on_front') ? (int) get_option( 'page_on_front' ) : 0;
if ( ! empty( $front_page ) ) {
@@ -780,7 +788,22 @@
}
}
- $posts = apply_filters( 'nav_menu_items_'.$post_type_name, $posts, $args, $post_type );
+ /**
+ * Filter the posts displayed in the 'View All' tab of the current
+ * post type's menu items meta box.
+ *
+ * The dynamic portion of the hook name, `$post_type_name`, refers
+ * to the slug of the current post type.
+ *
+ * @since 3.2.0
+ *
+ * @see WP_Query::query()
+ *
+ * @param array $posts The posts for the current post type.
+ * @param array $args An array of WP_Query arguments.
+ * @param object $post_type The current post type object for this menu item meta box.
+ */
+ $posts = apply_filters( "nav_menu_items_{$post_type_name}", $posts, $args, $post_type );
$checkbox_items = walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $posts), 0, (object) $args );
if ( 'all' == $current_tab && ! empty( $_REQUEST['selectall'] ) ) {
@@ -812,7 +835,7 @@
</span>
<span class="add-to-menu">
- <input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( __( 'Add to Menu' ) ); ?>" name="add-post-type-menu-item" id="<?php esc_attr_e( 'submit-posttype-' . $post_type_name ); ?>" />
+ <input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-post-type-menu-item" id="<?php echo esc_attr( 'submit-posttype-' . $post_type_name ); ?>" />
<span class="spinner"></span>
</span>
</p>
@@ -833,7 +856,7 @@
global $nav_menu_selected_id;
$taxonomy_name = $taxonomy['args']->name;
- // paginate browsing for large numbers of objects
+ // Paginate browsing for large numbers of objects.
$per_page = 50;
$pagenum = isset( $_REQUEST[$taxonomy_name . '-tab'] ) && isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1;
$offset = 0 < $pagenum ? $per_page * ( $pagenum - 1 ) : 0;
@@ -1000,7 +1023,7 @@
</span>
<span class="add-to-menu">
- <input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( __( 'Add to Menu' ) ); ?>" name="add-taxonomy-menu-item" id="<?php esc_attr_e( 'submit-taxonomy-' . $taxonomy_name ); ?>" />
+ <input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-taxonomy-menu-item" id="<?php echo esc_attr( 'submit-taxonomy-' . $taxonomy_name ); ?>" />
<span class="spinner"></span>
</span>
</p>
@@ -1024,21 +1047,26 @@
if ( 0 == $menu_id || is_nav_menu( $menu_id ) ) {
- // Loop through all the menu items' POST values
+ // Loop through all the menu items' POST values.
foreach( (array) $menu_data as $_possible_db_id => $_item_object_data ) {
if (
- empty( $_item_object_data['menu-item-object-id'] ) && // checkbox is not checked
+ // Checkbox is not checked.
+ empty( $_item_object_data['menu-item-object-id'] ) &&
(
- ! isset( $_item_object_data['menu-item-type'] ) || // and item type either isn't set
- in_array( $_item_object_data['menu-item-url'], array( 'http://', '' ) ) || // or URL is the default
+ // And item type either isn't set.
+ ! isset( $_item_object_data['menu-item-type'] ) ||
+ // Or URL is the default.
+ in_array( $_item_object_data['menu-item-url'], array( 'http://', '' ) ) ||
! ( 'custom' == $_item_object_data['menu-item-type'] && ! isset( $_item_object_data['menu-item-db-id'] ) ) || // or it's not a custom menu item (but not the custom home page)
- ! empty( $_item_object_data['menu-item-db-id'] ) // or it *is* a custom menu item that already exists
+ // Or it *is* a custom menu item that already exists.
+ ! empty( $_item_object_data['menu-item-db-id'] )
)
) {
- continue; // then this potential menu item is not getting added to this menu
+ // Then this potential menu item is not getting added to this menu.
+ continue;
}
- // if this possible menu item doesn't actually have a menu database ID yet
+ // If this possible menu item doesn't actually have a menu database ID yet.
if (
empty( $_item_object_data['menu-item-db-id'] ) ||
( 0 > $_possible_db_id ) ||
@@ -1091,20 +1119,20 @@
'post_status' => 'publish',
);
- // posts should show only published items
+ // Posts should show only published items.
} elseif ( 'post' == $object->name ) {
$object->_default_query = array(
'post_status' => 'publish',
);
- // cats should be in reverse chronological order
+ // Categories should be in reverse chronological order.
} elseif ( 'category' == $object->name ) {
$object->_default_query = array(
'orderby' => 'id',
'order' => 'DESC',
);
- // custom post types should show only published items
+ // Custom post types should show only published items.
} else {
$object->_default_query = array(
'post_status' => 'publish',
@@ -1120,7 +1148,7 @@
*
* @since 3.0.0
*
- * @param string $menu_id The ID of the menu to format.
+ * @param int $menu_id Optional. The ID of the menu to format. Default 0.
* @return string|WP_Error $output The menu formatted to edit or error object on failure.
*/
function wp_get_nav_menu_to_edit( $menu_id = 0 ) {
@@ -1137,6 +1165,14 @@
if( empty($menu_items) )
return $result . ' <ul class="menu" id="menu-to-edit"> </ul>';
+ /**
+ * Filter the Walker class used when adding nav menu items.
+ *
+ * @since 3.0.0
+ *
+ * @param string $class The walker class to use. Default 'Walker_Nav_Menu_Edit'.
+ * @param int $menu_id ID of the menu being rendered.
+ */
$walker_class_name = apply_filters( 'wp_edit_nav_menu_walker', 'Walker_Nav_Menu_Edit', $menu_id );
if ( class_exists( $walker_class_name ) )
@@ -1197,7 +1233,7 @@
global $wpdb;
$delete_timestamp = time() - ( DAY_IN_SECONDS * EMPTY_TRASH_DAYS );
- // delete orphaned draft menu items
+ // Delete orphaned draft menu items.
$menu_items_to_delete = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts AS p LEFT JOIN $wpdb->postmeta AS m ON p.ID = m.post_id WHERE post_type = 'nav_menu_item' AND post_status = 'draft' AND meta_key = '_menu_item_orphaned' AND meta_value < '%d'", $delete_timestamp ) );
foreach( (array) $menu_items_to_delete as $menu_item_id )
@@ -1210,16 +1246,13 @@
*
* @since 3.6.0
*
- * @uses wp_get_nav_menu_items() to retrieve the nav menu's menu items
- * @uses wp_defer_term_counter() to enable then disable term counting
- *
* @param int|string $nav_menu_selected_id (id, slug, or name ) of the currently-selected menu
* @param string $nav_menu_selected_title Title of the currently-selected menu
* @return array $messages The menu updated message
*/
function wp_nav_menu_update_menu_items ( $nav_menu_selected_id, $nav_menu_selected_title ) {
$unsorted_menu_items = wp_get_nav_menu_items( $nav_menu_selected_id, array( 'orderby' => 'ID', 'output' => ARRAY_A, 'output_key' => 'ID', 'post_status' => 'draft,publish' ) );
-
+ $messages = array();
$menu_items = array();
// Index menu items by db ID
foreach ( $unsorted_menu_items as $_item )
@@ -1281,9 +1314,10 @@
wp_defer_term_counting( false );
+ /** This action is documented in wp-includes/nav-menu.php */
do_action( 'wp_update_nav_menu', $nav_menu_selected_id );
- $messages[] = '<div id="message" class="updated"><p>' . sprintf( __( '<strong>%1$s</strong> has been updated.' ), $nav_menu_selected_title ) . '</p></div>';
+ $messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( __( '<strong>%1$s</strong> has been updated.' ), $nav_menu_selected_title ) . '</p></div>';
unset( $menu_items, $unsorted_menu_items );
return $messages;