X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/849f15aeed7a5e39314057bdc0064d8edd60dd7d..e3ff8f35458a959c1879c0a4976701ed8dcfe651:/wp-admin/includes/nav-menu.php?ds=sidebyside diff --git a/wp-admin/includes/nav-menu.php b/wp-admin/includes/nav-menu.php index f8adbf26..a6aac330 100644 --- a/wp-admin/includes/nav-menu.php +++ b/wp-admin/includes/nav-menu.php @@ -1,335 +1,17 @@ $_wp_nav_menu_max_depth ? $depth : $_wp_nav_menu_max_depth; - - ob_start(); - $item_id = esc_attr( $item->ID ); - $removed_args = array( - 'action', - 'customlink-tab', - 'edit-menu-item', - 'menu-item', - 'page-tab', - '_wpnonce', - ); - - $original_title = ''; - if ( 'taxonomy' == $item->type ) { - $original_title = get_term_field( 'name', $item->object_id, $item->object, 'raw' ); - if ( is_wp_error( $original_title ) ) - $original_title = false; - } elseif ( 'post_type' == $item->type ) { - $original_object = get_post( $item->object_id ); - $original_title = get_the_title( $original_object->ID ); - } - - $classes = array( - 'menu-item menu-item-depth-' . $depth, - 'menu-item-' . esc_attr( $item->object ), - 'menu-item-edit-' . ( ( isset( $_GET['edit-menu-item'] ) && $item_id == $_GET['edit-menu-item'] ) ? 'active' : 'inactive'), - ); - - $title = $item->title; - - if ( ! empty( $item->_invalid ) ) { - $classes[] = 'menu-item-invalid'; - /* translators: %s: title of menu item which is invalid */ - $title = sprintf( __( '%s (Invalid)' ), $item->title ); - } elseif ( isset( $item->post_status ) && 'draft' == $item->post_status ) { - $classes[] = 'pending'; - /* translators: %s: title of menu item in draft status */ - $title = sprintf( __('%s (Pending)'), $item->title ); - } - - $title = ( ! isset( $item->label ) || '' == $item->label ) ? $title : $item->label; - - $submenu_text = ''; - if ( 0 == $depth ) - $submenu_text = 'style="display: none;"'; - - ?> -
- + + - 'submit-quick-search-posttype-' . $post_type_name ) ); ?> + 'submit-quick-search-posttype-' . $post_type_name ) ); ?>
- + + - 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?> + 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?>
' . __( 'Add menu items from the column on the left.' ) . '
'; $result .= ''; - if( empty($menu_items) ) + if ( empty($menu_items) ) return $result . ' '; /** - * Filter the Walker class used when adding nav menu items. + * Filters the Walker class used when adding nav menu items. * * @since 3.0.0 * @@ -1175,24 +927,32 @@ function wp_get_nav_menu_to_edit( $menu_id = 0 ) { */ $walker_class_name = apply_filters( 'wp_edit_nav_menu_walker', 'Walker_Nav_Menu_Edit', $menu_id ); - if ( class_exists( $walker_class_name ) ) + if ( class_exists( $walker_class_name ) ) { $walker = new $walker_class_name; - else - return new WP_Error( 'menu_walker_not_exist', sprintf( __('The Walker class named %s does not exist.'), $walker_class_name ) ); + } else { + return new WP_Error( 'menu_walker_not_exist', + /* translators: %s: walker class name */ + sprintf( __( 'The Walker class named %s does not exist.' ), + '' . $walker_class_name . '' + ) + ); + } $some_pending_menu_items = $some_invalid_menu_items = false; - foreach( (array) $menu_items as $menu_item ) { + foreach ( (array) $menu_items as $menu_item ) { if ( isset( $menu_item->post_status ) && 'draft' == $menu_item->post_status ) $some_pending_menu_items = true; if ( ! empty( $menu_item->_invalid ) ) $some_invalid_menu_items = true; } - if ( $some_pending_menu_items ) - $result .= '' . __('Click Save Menu to make pending menu items public.') . '
' . __( 'Click Save Menu to make pending menu items public.' ) . '
' . __('There are some invalid menu items. Please check or delete them.') . '
' . __( 'There are some invalid menu items. Please check or delete them.' ) . '