Ticket #25474: 25474.2.diff

trunk/wp-admin/includes/nav-menu.php

@@ -498 +498 @@
                 return;
 
         foreach ( $post_types as $post_type ) {
+                /**
+                 * Filter the post types used as menu item metaboxes.
+                 *
+                 * If you return a falsey value instead of a post type object,
+                 * the post type will be excluded as a menu item metabox.
+                 *
+                 * @since 3.0.0
+                 *
+                 * @param object $post_type The post type object to be used as a metabox.
+                 */
                 $post_type = apply_filters( 'nav_menu_meta_box_object', $post_type );
                 if ( $post_type ) {
                         $id = $post_type->name;
@@ -520 +530 @@
                 return;
 
         foreach ( $taxonomies as $tax ) {
+                /**
+                 * Filter the taxonomies used as menu item metaboxes.
+                 *
+                 * If you return a falsey value instead of a taxonomy object,
+                 * the taxonomy will be excluded as a menu item metabox.
+                 *
+                 * @since 3.0.0
+                 *
+                 * @param object $tax The taxonomy object to be used as a metabox.
+                 */
                 $tax = apply_filters( 'nav_menu_meta_box_object', $tax );
                 if ( $tax ) {
                         $id = $tax->name;
@@ -775 +795 @@
                                         }
                                 }
 
-                                $posts = apply_filters( 'nav_menu_items_'.$post_type_name, $posts, $args, $post_type );
+                                /**
+                                 * Filter the posts displayed in the View All tab of the menu item metabox for a specific post type.
+                                 *
+                                 * @since 3.2.0
+                                 *
+                                 * @param array  $posts     All of the posts for the current post type.
+                                 * @param array  $args      An array of arguments. @see WP_QUERY::query()
+                                 * @param object $post_type The current post type object for this menu item metabox.
+                                 */
+                                $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'] ) ) {
@@ -1132 +1161 @@
                 if( empty($menu_items) )
                         return $result . ' <ul class="menu" id="menu-to-edit"> </ul>';
 
-                $walker_class_name = apply_filters( 'wp_edit_nav_menu_walker', 'Walker_Nav_Menu_Edit', $menu_id );
+                $walker_class_name = 'Walker_Nav_Menu_Edit';
 
+                /**
+                 * Filter the Walker used to render a menu formatted for editing.
+                 *
+                 * @since 3.0.0
+                 *
+                 * @param string $walker_class_name The Walker class used to render a menu formatted for editing.
+                 * @param int    $menu_id           The id of the menu being rendered.
+                 */
+                $walker_class_name = apply_filters( 'wp_edit_nav_menu_walker', $walker_class_name, $menu_id );
+
                 if ( class_exists( $walker_class_name ) )
                         $walker = new $walker_class_name;
                 else
@@ -1276 +1315 @@
 
         wp_defer_term_counting( false );
 
+        //duplicate_hook
         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>';