From 7a0eb63a19e3ea991e874fc372b7776c8bd25b4d Mon Sep 17 00:00:00 2001 From: "Drew Jaynes (DrewAPicture)" Date: Fri, 25 Apr 2014 06:13:15 +0000 Subject: [PATCH] Ensure the `nav_menu_meta_box_object` filter hook is only documented once. See #26869. git-svn-id: https://develop.svn.wordpress.org/trunk@28207 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/ajax-actions.php | 10 ++-------- src/wp-admin/includes/nav-menu.php | 21 +++++++-------------- 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/src/wp-admin/includes/ajax-actions.php b/src/wp-admin/includes/ajax-actions.php index ed78e3c01d..f72aafa052 100644 --- a/src/wp-admin/includes/ajax-actions.php +++ b/src/wp-admin/includes/ajax-actions.php @@ -1174,14 +1174,8 @@ function wp_ajax_menu_get_metabox() { if ( ! empty( $_POST['item-object'] ) && isset( $items[$_POST['item-object']] ) ) { $menus_meta_box_object = $items[ $_POST['item-object'] ]; - /** - * Filter a nav menu meta box object. - * - * @since 3.0.0 - * - * @param object $menus_meta_box_object A nav menu meta box object, such as Page, - * Post, Category, Tag, etc. - */ + + /** This filter is documented in wp-admin/includes/nav-menu.php */ $item = apply_filters( 'nav_menu_meta_box_object', $menus_meta_box_object ); ob_start(); call_user_func_array($callback, array( diff --git a/src/wp-admin/includes/nav-menu.php b/src/wp-admin/includes/nav-menu.php index 05a9b29476..38ca22e0e2 100644 --- a/src/wp-admin/includes/nav-menu.php +++ b/src/wp-admin/includes/nav-menu.php @@ -503,14 +503,16 @@ function wp_nav_menu_post_type_meta_boxes() { foreach ( $post_types as $post_type ) { /** - * Filter whether a menu items meta box will be added for the current 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 a post type object, - * the post type menu items meta box will not be added. + * 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 $post_type The post type object to be used as a meta box. + * @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 ) { @@ -534,16 +536,7 @@ function wp_nav_menu_taxonomy_meta_boxes() { return; foreach ( $taxonomies as $tax ) { - /** - * Filter whether a menu items meta box will be added for the current taxonomy. - * - * If a falsey value is returned instead of a taxonomy object, - * the taxonomy menu items meta box will not be added. - * - * @since 3.0.0 - * - * @param object $tax The taxonomy object to be used as a meta box. - */ + /** 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;