From 029dd247beaa649013d132a655d41e6190d0c433 Mon Sep 17 00:00:00 2001 From: Drew Jaynes Date: Fri, 25 Apr 2014 06:50:15 +0000 Subject: [PATCH] Ensure the `wp_edit_nav_menu_walker` filter is only documented once. See #26869. Built from https://develop.svn.wordpress.org/trunk@28213 git-svn-id: http://core.svn.wordpress.org/trunk@28043 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/ajax-actions.php | 9 +-------- wp-admin/includes/nav-menu.php | 6 +++--- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/wp-admin/includes/ajax-actions.php b/wp-admin/includes/ajax-actions.php index f72aafa052..f76119b910 100644 --- a/wp-admin/includes/ajax-actions.php +++ b/wp-admin/includes/ajax-actions.php @@ -956,14 +956,7 @@ function wp_ajax_add_menu_item() { } } - /** - * Filter the Walker class used when adding nav menu items. - * - * @since 3.4.0 - * - * @param string $class The walker class to use. Default 'Walker_Nav_Menu_Edit'. - * @param int $menu_id The menu id, derived from $_POST['menu']. - */ + /** This filter is documented in wp-admin/includes/nav-menu.php */ $walker_class_name = apply_filters( 'wp_edit_nav_menu_walker', 'Walker_Nav_Menu_Edit', $_POST['menu'] ); if ( ! class_exists( $walker_class_name ) ) diff --git a/wp-admin/includes/nav-menu.php b/wp-admin/includes/nav-menu.php index 38ca22e0e2..1dfccf058d 100644 --- a/wp-admin/includes/nav-menu.php +++ b/wp-admin/includes/nav-menu.php @@ -1165,12 +1165,12 @@ function wp_get_nav_menu_to_edit( $menu_id = 0 ) { return $result . ' '; /** - * Filter the Walker class used to render a menu formatted for editing. + * Filter the Walker class used when adding nav menu items. * * @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. + * @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 );