--- a/wp/wp-admin/includes/nav-menu.php Tue Oct 22 16:11:46 2019 +0200
+++ b/wp/wp-admin/includes/nav-menu.php Tue Dec 15 13:49:49 2020 +0100
@@ -8,10 +8,10 @@
*/
/** Walker_Nav_Menu_Edit class */
-require_once( ABSPATH . 'wp-admin/includes/class-walker-nav-menu-edit.php' );
+require_once ABSPATH . 'wp-admin/includes/class-walker-nav-menu-edit.php';
/** Walker_Nav_Menu_Checklist class */
-require_once( ABSPATH . 'wp-admin/includes/class-walker-nav-menu-checklist.php' );
+require_once ABSPATH . 'wp-admin/includes/class-walker-nav-menu-checklist.php';
/**
* Prints the appropriate response to a menu quick search.
@@ -25,19 +25,23 @@
$type = isset( $request['type'] ) ? $request['type'] : '';
$object_type = isset( $request['object_type'] ) ? $request['object_type'] : '';
$query = isset( $request['q'] ) ? $request['q'] : '';
- $response_format = isset( $request['response-format'] ) && in_array( $request['response-format'], array( 'json', 'markup' ) ) ? $request['response-format'] : 'json';
+ $response_format = isset( $request['response-format'] ) ? $request['response-format'] : '';
- if ( 'markup' == $response_format ) {
+ if ( ! $response_format || ! in_array( $response_format, array( 'json', 'markup' ), true ) ) {
+ $response_format = 'json';
+ }
+
+ if ( 'markup' === $response_format ) {
$args['walker'] = new Walker_Nav_Menu_Checklist;
}
- if ( 'get-post-item' == $type ) {
+ if ( 'get-post-item' === $type ) {
if ( post_type_exists( $object_type ) ) {
if ( isset( $request['ID'] ) ) {
$object_id = (int) $request['ID'];
- if ( 'markup' == $response_format ) {
+ 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 ) {
+ } elseif ( 'json' === $response_format ) {
echo wp_json_encode(
array(
'ID' => $object_id,
@@ -51,9 +55,9 @@
} elseif ( taxonomy_exists( $object_type ) ) {
if ( isset( $request['ID'] ) ) {
$object_id = (int) $request['ID'];
- if ( 'markup' == $response_format ) {
+ if ( 'markup' === $response_format ) {
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 ) {
+ } elseif ( 'json' === $response_format ) {
$post_obj = get_term( $object_id, $object_type );
echo wp_json_encode(
array(
@@ -67,7 +71,7 @@
}
}
} elseif ( preg_match( '/quick-search-(posttype|taxonomy)-([a-zA-Z_-]*\b)/', $type, $matches ) ) {
- if ( 'posttype' == $matches[1] && get_post_type_object( $matches[2] ) ) {
+ if ( 'posttype' === $matches[1] && get_post_type_object( $matches[2] ) ) {
$post_type_obj = _wp_nav_menu_meta_box_object( get_post_type_object( $matches[2] ) );
$args = array_merge(
$args,
@@ -89,10 +93,10 @@
}
while ( $search_results_query->have_posts() ) {
$post = $search_results_query->next_post();
- if ( 'markup' == $response_format ) {
+ if ( 'markup' === $response_format ) {
$var_by_ref = $post->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 ) {
+ } elseif ( 'json' === $response_format ) {
echo wp_json_encode(
array(
'ID' => $post->ID,
@@ -103,21 +107,22 @@
echo "\n";
}
}
- } elseif ( 'taxonomy' == $matches[1] ) {
+ } elseif ( 'taxonomy' === $matches[1] ) {
$terms = get_terms(
array(
'taxonomy' => $matches[2],
'name__like' => $query,
'number' => 10,
+ 'hide_empty' => false,
)
);
if ( empty( $terms ) || is_wp_error( $terms ) ) {
return;
}
foreach ( (array) $terms as $term ) {
- if ( 'markup' == $response_format ) {
+ 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 ) {
+ } elseif ( 'json' === $response_format ) {
echo wp_json_encode(
array(
'ID' => $term->term_id,
@@ -138,12 +143,12 @@
* @since 3.0.0
*/
function wp_nav_menu_setup() {
- // Register meta boxes
+ // Register meta boxes.
wp_nav_menu_post_type_meta_boxes();
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)
+ // Register advanced menu items (columns).
add_filter( 'manage_nav-menus_columns', 'wp_nav_menu_manage_columns' );
// If first time editing, disable advanced items by default.
@@ -184,7 +189,7 @@
foreach ( array_keys( $wp_meta_boxes['nav-menus'] ) as $context ) {
foreach ( array_keys( $wp_meta_boxes['nav-menus'][ $context ] ) as $priority ) {
foreach ( $wp_meta_boxes['nav-menus'][ $context ][ $priority ] as $box ) {
- if ( in_array( $box['id'], $initial_meta_boxes ) ) {
+ if ( in_array( $box['id'], $initial_meta_boxes, true ) ) {
unset( $box['id'] );
} else {
$hidden_meta_boxes[] = $box['id'];
@@ -219,14 +224,14 @@
*
* @since 3.0.0
*
- * @param object $meta_box_object The current object to add a menu items
- * meta box for.
+ * @param WP_Post_Type|false $post_type 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.
- $priority = ( 'page' == $post_type->name ? 'core' : 'default' );
+ $priority = ( 'page' === $post_type->name ? 'core' : 'default' );
add_meta_box( "add-post-type-{$id}", $post_type->labels->name, 'wp_nav_menu_item_post_type_meta_box', 'nav-menus', 'side', $priority, $post_type );
}
}
@@ -255,23 +260,25 @@
}
/**
- * Check whether to disable the Menu Locations meta box submit button
+ * Check whether to disable the Menu Locations meta box submit button and inputs.
*
* @since 3.6.0
+ * @since 5.3.1 The `$echo` parameter was added.
*
* @global bool $one_theme_location_no_menus to determine if no menus exist
*
- * @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
+ * @param int|string $nav_menu_selected_id ID, name, or slug of the currently selected menu.
+ * @param bool $echo Whether to echo or just return the string.
+ * @return string|false Disabled attribute if at least one menu exists, false if not.
*/
-function wp_nav_menu_disabled_check( $nav_menu_selected_id ) {
+function wp_nav_menu_disabled_check( $nav_menu_selected_id, $echo = true ) {
global $one_theme_location_no_menus;
if ( $one_theme_location_no_menus ) {
return false;
}
- return disabled( $nav_menu_selected_id, 0 );
+ return disabled( $nav_menu_selected_id, 0, $echo );
}
/**
@@ -292,12 +299,12 @@
<input type="hidden" value="custom" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-type]" />
<p id="menu-item-url-wrap" class="wp-clearfix">
<label class="howto" for="custom-menu-item-url"><?php _e( 'URL' ); ?></label>
- <input id="custom-menu-item-url" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-url]" type="text" class="code menu-item-textbox" value="http://" />
+ <input id="custom-menu-item-url" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-url]" type="text"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="code menu-item-textbox" placeholder="https://" />
</p>
<p id="menu-item-name-wrap" class="wp-clearfix">
<label class="howto" for="custom-menu-item-name"><?php _e( 'Link Text' ); ?></label>
- <input id="custom-menu-item-name" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-title]" type="text" class="regular-text menu-item-textbox" />
+ <input id="custom-menu-item-name" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-title]" type="text"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="regular-text menu-item-textbox" />
</p>
<p class="button-controls wp-clearfix">
@@ -325,7 +332,7 @@
*
* @type string $id Meta box 'id' attribute.
* @type string $title Meta box title.
- * @type string $callback Meta box display callback.
+ * @type callable $callback Meta box display callback.
* @type WP_Post_Type $args Extra meta box arguments (the post type object for this meta box).
* }
*/
@@ -333,10 +340,12 @@
global $_nav_menu_placeholder, $nav_menu_selected_id;
$post_type_name = $box['args']->name;
+ $post_type = get_post_type_object( $post_type_name );
+ $tab_name = $post_type_name . '-tab';
// 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;
+ $pagenum = isset( $_REQUEST[ $tab_name ] ) && isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1;
$offset = 0 < $pagenum ? $per_page * ( $pagenum - 1 ) : 0;
$args = array(
@@ -354,12 +363,88 @@
$args = array_merge( $args, (array) $box['args']->_default_query );
}
- // @todo transient caching of these results with proper invalidation on updating of a post of this type
+ /*
+ * If we're dealing with pages, let's prioritize the Front Page,
+ * Posts Page and Privacy Policy Page at the top of the list.
+ */
+ $important_pages = array();
+ if ( 'page' === $post_type_name ) {
+ $suppress_page_ids = array();
+
+ // Insert Front Page or custom Home link.
+ $front_page = 'page' === get_option( 'show_on_front' ) ? (int) get_option( 'page_on_front' ) : 0;
+
+ $front_page_obj = null;
+ if ( ! empty( $front_page ) ) {
+ $front_page_obj = get_post( $front_page );
+ $front_page_obj->front_or_home = true;
+
+ $important_pages[] = $front_page_obj;
+ $suppress_page_ids[] = $front_page_obj->ID;
+ } else {
+ $_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval( $_nav_menu_placeholder ) - 1 : -1;
+ $front_page_obj = (object) array(
+ 'front_or_home' => true,
+ 'ID' => 0,
+ 'object_id' => $_nav_menu_placeholder,
+ 'post_content' => '',
+ 'post_excerpt' => '',
+ 'post_parent' => '',
+ 'post_title' => _x( 'Home', 'nav menu home label' ),
+ 'post_type' => 'nav_menu_item',
+ 'type' => 'custom',
+ 'url' => home_url( '/' ),
+ );
+
+ $important_pages[] = $front_page_obj;
+ }
+
+ // Insert Posts Page.
+ $posts_page = 'page' === get_option( 'show_on_front' ) ? (int) get_option( 'page_for_posts' ) : 0;
+
+ if ( ! empty( $posts_page ) ) {
+ $posts_page_obj = get_post( $posts_page );
+ $posts_page_obj->posts_page = true;
+
+ $important_pages[] = $posts_page_obj;
+ $suppress_page_ids[] = $posts_page_obj->ID;
+ }
+
+ // Insert Privacy Policy Page.
+ $privacy_policy_page_id = (int) get_option( 'wp_page_for_privacy_policy' );
+
+ if ( ! empty( $privacy_policy_page_id ) ) {
+ $privacy_policy_page = get_post( $privacy_policy_page_id );
+ if ( $privacy_policy_page instanceof WP_Post && 'publish' === $privacy_policy_page->post_status ) {
+ $privacy_policy_page->privacy_policy_page = true;
+
+ $important_pages[] = $privacy_policy_page;
+ $suppress_page_ids[] = $privacy_policy_page->ID;
+ }
+ }
+
+ // Add suppression array to arguments for WP_Query.
+ if ( ! empty( $suppress_page_ids ) ) {
+ $args['post__not_in'] = $suppress_page_ids;
+ }
+ }
+
+ // @todo Transient caching of these results with proper invalidation on updating of a post of this type.
$get_posts = new WP_Query;
$posts = $get_posts->query( $args );
+
+ // Only suppress and insert when more than just suppression pages available.
if ( ! $get_posts->post_count ) {
- echo '<p>' . __( 'No items.' ) . '</p>';
- return;
+ if ( ! empty( $suppress_page_ids ) ) {
+ unset( $args['post__not_in'] );
+ $get_posts = new WP_Query;
+ $posts = $get_posts->query( $args );
+ } else {
+ echo '<p>' . __( 'No items.' ) . '</p>';
+ return;
+ }
+ } elseif ( ! empty( $important_pages ) ) {
+ $posts = array_merge( $important_pages, $posts );
}
$num_pages = $get_posts->max_num_pages;
@@ -368,10 +453,10 @@
array(
'base' => add_query_arg(
array(
- $post_type_name . '-tab' => 'all',
- 'paged' => '%#%',
- 'item-type' => 'post_type',
- 'item-object' => $post_type_name,
+ $tab_name => 'all',
+ 'paged' => '%#%',
+ 'item-type' => 'post_type',
+ 'item-object' => $post_type_name,
)
),
'format' => '',
@@ -394,8 +479,9 @@
$walker = new Walker_Nav_Menu_Checklist( $db_fields );
$current_tab = 'most-recent';
- if ( isset( $_REQUEST[ $post_type_name . '-tab' ] ) && in_array( $_REQUEST[ $post_type_name . '-tab' ], array( 'all', 'search' ) ) ) {
- $current_tab = $_REQUEST[ $post_type_name . '-tab' ];
+
+ if ( isset( $_REQUEST[ $tab_name ] ) && in_array( $_REQUEST[ $tab_name ], array( 'all', 'search' ), true ) ) {
+ $current_tab = $_REQUEST[ $tab_name ];
}
if ( ! empty( $_REQUEST[ 'quick-search-posttype-' . $post_type_name ] ) ) {
@@ -411,33 +497,35 @@
'_wpnonce',
);
- $most_recent_url = $view_all_url = $search_url = '';
+ $most_recent_url = '';
+ $view_all_url = '';
+ $search_url = '';
if ( $nav_menu_selected_id ) {
- $most_recent_url = esc_url( add_query_arg( $post_type_name . '-tab', 'most-recent', remove_query_arg( $removed_args ) ) );
- $view_all_url = esc_url( add_query_arg( $post_type_name . '-tab', 'all', remove_query_arg( $removed_args ) ) );
- $search_url = esc_url( add_query_arg( $post_type_name . '-tab', 'search', remove_query_arg( $removed_args ) ) );
+ $most_recent_url = esc_url( add_query_arg( $tab_name, 'most-recent', remove_query_arg( $removed_args ) ) );
+ $view_all_url = esc_url( add_query_arg( $tab_name, 'all', remove_query_arg( $removed_args ) ) );
+ $search_url = esc_url( add_query_arg( $tab_name, 'search', remove_query_arg( $removed_args ) ) );
}
?>
<div id="posttype-<?php echo $post_type_name; ?>" class="posttypediv">
<ul id="posttype-<?php echo $post_type_name; ?>-tabs" class="posttype-tabs add-menu-item-tabs">
- <li <?php echo ( 'most-recent' == $current_tab ? ' class="tabs"' : '' ); ?>>
+ <li <?php echo ( 'most-recent' === $current_tab ? ' class="tabs"' : '' ); ?>>
<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-most-recent" href="<?php echo $most_recent_url; ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent">
<?php _e( 'Most Recent' ); ?>
</a>
</li>
- <li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>>
+ <li <?php echo ( 'all' === $current_tab ? ' class="tabs"' : '' ); ?>>
<a class="nav-tab-link" data-type="<?php echo esc_attr( $post_type_name ); ?>-all" href="<?php echo $view_all_url; ?>#<?php echo $post_type_name; ?>-all">
<?php _e( 'View All' ); ?>
</a>
</li>
- <li <?php echo ( 'search' == $current_tab ? ' class="tabs"' : '' ); ?>>
+ <li <?php echo ( 'search' === $current_tab ? ' class="tabs"' : '' ); ?>>
<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-search" href="<?php echo $search_url; ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
<?php _e( 'Search' ); ?>
</a>
</li>
</ul><!-- .posttype-tabs -->
- <div id="tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent" class="tabs-panel <?php echo ( 'most-recent' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>">
+ <div id="tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent" class="tabs-panel <?php echo ( 'most-recent' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>" role="region" aria-label="<?php _e( 'Most Recent' ); ?>" tabindex="0">
<ul id="<?php echo $post_type_name; ?>checklist-most-recent" class="categorychecklist form-no-clear">
<?php
$recent_args = array_merge(
@@ -472,7 +560,7 @@
</ul>
</div><!-- /.tabs-panel -->
- <div class="tabs-panel <?php echo ( 'search' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>" id="tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
+ <div class="tabs-panel <?php echo ( 'search' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>" id="tabs-panel-posttype-<?php echo $post_type_name; ?>-search" role="region" aria-label="<?php echo $post_type->labels->search_items; ?>" tabindex="0">
<?php
if ( isset( $_REQUEST[ 'quick-search-posttype-' . $post_type_name ] ) ) {
$searched = esc_attr( $_REQUEST[ 'quick-search-posttype-' . $post_type_name ] );
@@ -491,7 +579,7 @@
?>
<p class="quick-search-wrap">
<label for="quick-search-posttype-<?php echo $post_type_name; ?>" class="screen-reader-text"><?php _e( 'Search' ); ?></label>
- <input type="search" class="quick-search" value="<?php echo $searched; ?>" name="quick-search-posttype-<?php echo $post_type_name; ?>" id="quick-search-posttype-<?php echo $post_type_name; ?>" />
+ <input type="search"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="quick-search" value="<?php echo $searched; ?>" name="quick-search-posttype-<?php echo $post_type_name; ?>" id="quick-search-posttype-<?php echo $post_type_name; ?>" />
<span class="spinner"></span>
<?php submit_button( __( 'Search' ), 'small quick-search-submit hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-posttype-' . $post_type_name ) ); ?>
</p>
@@ -510,7 +598,7 @@
</ul>
</div><!-- /.tabs-panel -->
- <div id="<?php echo $post_type_name; ?>-all" class="tabs-panel tabs-panel-view-all <?php echo ( 'all' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>">
+ <div id="<?php echo $post_type_name; ?>-all" class="tabs-panel tabs-panel-view-all <?php echo ( 'all' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>" role="region" aria-label="<?php echo $post_type->labels->all_items; ?>" tabindex="0">
<?php if ( ! empty( $page_links ) ) : ?>
<div class="add-menu-item-pagelinks">
<?php echo $page_links; ?>
@@ -520,38 +608,6 @@
<?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 ( 'page' == $post_type_name ) {
- $front_page = 'page' == get_option( 'show_on_front' ) ? (int) get_option( 'page_on_front' ) : 0;
- if ( ! empty( $front_page ) ) {
- $front_page_obj = get_post( $front_page );
- $front_page_obj->front_or_home = true;
- array_unshift( $posts, $front_page_obj );
- } else {
- $_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval( $_nav_menu_placeholder ) - 1 : -1;
- array_unshift(
- $posts,
- (object) array(
- 'front_or_home' => true,
- 'ID' => 0,
- 'object_id' => $_nav_menu_placeholder,
- 'post_content' => '',
- 'post_excerpt' => '',
- 'post_parent' => '',
- 'post_title' => _x( 'Home', 'nav menu home label' ),
- 'post_type' => 'nav_menu_item',
- 'type' => 'custom',
- 'url' => home_url( '/' ),
- )
- );
- }
- }
-
- $post_type = get_post_type_object( $post_type_name );
-
if ( $post_type->has_archive ) {
$_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval( $_nav_menu_placeholder ) - 1 : -1;
array_unshift(
@@ -591,11 +647,6 @@
$checkbox_items = walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $posts ), 0, (object) $args );
- if ( 'all' == $current_tab && ! empty( $_REQUEST['selectall'] ) ) {
- $checkbox_items = preg_replace( '/(type=(.)checkbox(\2))/', '$1 checked=$2checked$2', $checkbox_items );
-
- }
-
echo $checkbox_items;
?>
</ul>
@@ -606,21 +657,10 @@
<?php endif; ?>
</div><!-- /.tabs-panel -->
- <p class="button-controls wp-clearfix">
- <span class="list-controls">
- <a href="
- <?php
- echo esc_url(
- add_query_arg(
- array(
- $post_type_name . '-tab' => 'all',
- 'selectall' => 1,
- ),
- remove_query_arg( $removed_args )
- )
- );
- ?>
- #posttype-<?php echo $post_type_name; ?>" class="select-all aria-button-if-js"><?php _e( 'Select All' ); ?></a>
+ <p class="button-controls wp-clearfix" data-items-type="posttype-<?php echo esc_attr( $post_type_name ); ?>">
+ <span class="list-controls hide-if-no-js">
+ <input type="checkbox"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> id="<?php echo esc_attr( $tab_name ); ?>" class="select-all" />
+ <label for="<?php echo esc_attr( $tab_name ); ?>"><?php _e( 'Select All' ); ?></label>
</span>
<span class="add-to-menu">
@@ -644,23 +684,26 @@
* @param array $box {
* Taxonomy menu item meta box arguments.
*
- * @type string $id Meta box 'id' attribute.
- * @type string $title Meta box title.
- * @type string $callback Meta box display callback.
- * @type object $args Extra meta box arguments (the taxonomy object for this meta box).
+ * @type string $id Meta box 'id' attribute.
+ * @type string $title Meta box title.
+ * @type callable $callback Meta box display callback.
+ * @type object $args Extra meta box arguments (the taxonomy object for this meta box).
* }
*/
function wp_nav_menu_item_taxonomy_meta_box( $object, $box ) {
global $nav_menu_selected_id;
+
$taxonomy_name = $box['args']->name;
$taxonomy = get_taxonomy( $taxonomy_name );
+ $tab_name = $taxonomy_name . '-tab';
// Paginate browsing for large numbers of objects.
$per_page = 50;
- $pagenum = isset( $_REQUEST[ $taxonomy_name . '-tab' ] ) && isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1;
+ $pagenum = isset( $_REQUEST[ $tab_name ] ) && isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1;
$offset = 0 < $pagenum ? $per_page * ( $pagenum - 1 ) : 0;
$args = array(
+ 'taxonomy' => $taxonomy_name,
'child_of' => 0,
'exclude' => '',
'hide_empty' => false,
@@ -673,7 +716,7 @@
'pad_counts' => false,
);
- $terms = get_terms( $taxonomy_name, $args );
+ $terms = get_terms( $args );
if ( ! $terms || is_wp_error( $terms ) ) {
echo '<p>' . __( 'No items.' ) . '</p>';
@@ -697,10 +740,10 @@
array(
'base' => add_query_arg(
array(
- $taxonomy_name . '-tab' => 'all',
- 'paged' => '%#%',
- 'item-type' => 'taxonomy',
- 'item-object' => $taxonomy_name,
+ $tab_name => 'all',
+ 'paged' => '%#%',
+ 'item-type' => 'taxonomy',
+ 'item-object' => $taxonomy_name,
)
),
'format' => '',
@@ -723,8 +766,9 @@
$walker = new Walker_Nav_Menu_Checklist( $db_fields );
$current_tab = 'most-used';
- if ( isset( $_REQUEST[ $taxonomy_name . '-tab' ] ) && in_array( $_REQUEST[ $taxonomy_name . '-tab' ], array( 'all', 'most-used', 'search' ) ) ) {
- $current_tab = $_REQUEST[ $taxonomy_name . '-tab' ];
+
+ if ( isset( $_REQUEST[ $tab_name ] ) && in_array( $_REQUEST[ $tab_name ], array( 'all', 'most-used', 'search' ), true ) ) {
+ $current_tab = $_REQUEST[ $tab_name ];
}
if ( ! empty( $_REQUEST[ 'quick-search-taxonomy-' . $taxonomy_name ] ) ) {
@@ -740,38 +784,40 @@
'_wpnonce',
);
- $most_used_url = $view_all_url = $search_url = '';
+ $most_used_url = '';
+ $view_all_url = '';
+ $search_url = '';
if ( $nav_menu_selected_id ) {
- $most_used_url = esc_url( add_query_arg( $taxonomy_name . '-tab', 'most-used', remove_query_arg( $removed_args ) ) );
- $view_all_url = esc_url( add_query_arg( $taxonomy_name . '-tab', 'all', remove_query_arg( $removed_args ) ) );
- $search_url = esc_url( add_query_arg( $taxonomy_name . '-tab', 'search', remove_query_arg( $removed_args ) ) );
+ $most_used_url = esc_url( add_query_arg( $tab_name, 'most-used', remove_query_arg( $removed_args ) ) );
+ $view_all_url = esc_url( add_query_arg( $tab_name, 'all', remove_query_arg( $removed_args ) ) );
+ $search_url = esc_url( add_query_arg( $tab_name, 'search', remove_query_arg( $removed_args ) ) );
}
?>
<div id="taxonomy-<?php echo $taxonomy_name; ?>" class="taxonomydiv">
<ul id="taxonomy-<?php echo $taxonomy_name; ?>-tabs" class="taxonomy-tabs add-menu-item-tabs">
- <li <?php echo ( 'most-used' == $current_tab ? ' class="tabs"' : '' ); ?>>
+ <li <?php echo ( 'most-used' === $current_tab ? ' class="tabs"' : '' ); ?>>
<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-pop" href="<?php echo $most_used_url; ?>#tabs-panel-<?php echo $taxonomy_name; ?>-pop">
<?php echo esc_html( $taxonomy->labels->most_used ); ?>
</a>
</li>
- <li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>>
+ <li <?php echo ( 'all' === $current_tab ? ' class="tabs"' : '' ); ?>>
<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-all" href="<?php echo $view_all_url; ?>#tabs-panel-<?php echo $taxonomy_name; ?>-all">
<?php _e( 'View All' ); ?>
</a>
</li>
- <li <?php echo ( 'search' == $current_tab ? ' class="tabs"' : '' ); ?>>
+ <li <?php echo ( 'search' === $current_tab ? ' class="tabs"' : '' ); ?>>
<a class="nav-tab-link" data-type="tabs-panel-search-taxonomy-<?php echo esc_attr( $taxonomy_name ); ?>" href="<?php echo $search_url; ?>#tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
<?php _e( 'Search' ); ?>
</a>
</li>
</ul><!-- .taxonomy-tabs -->
- <div id="tabs-panel-<?php echo $taxonomy_name; ?>-pop" class="tabs-panel <?php echo ( 'most-used' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?> ">
+ <div id="tabs-panel-<?php echo $taxonomy_name; ?>-pop" class="tabs-panel <?php echo ( 'most-used' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>" role="region" aria-label="<?php echo $taxonomy->labels->most_used; ?>" tabindex="0">
<ul id="<?php echo $taxonomy_name; ?>checklist-pop" class="categorychecklist form-no-clear" >
<?php
$popular_terms = get_terms(
- $taxonomy_name,
array(
+ 'taxonomy' => $taxonomy_name,
'orderby' => 'count',
'order' => 'DESC',
'number' => 10,
@@ -784,7 +830,7 @@
</ul>
</div><!-- /.tabs-panel -->
- <div id="tabs-panel-<?php echo $taxonomy_name; ?>-all" class="tabs-panel tabs-panel-view-all <?php echo ( 'all' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?> ">
+ <div id="tabs-panel-<?php echo $taxonomy_name; ?>-all" class="tabs-panel tabs-panel-view-all <?php echo ( 'all' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>" role="region" aria-label="<?php echo $taxonomy->labels->all_items; ?>" tabindex="0">
<?php if ( ! empty( $page_links ) ) : ?>
<div class="add-menu-item-pagelinks">
<?php echo $page_links; ?>
@@ -803,13 +849,13 @@
<?php endif; ?>
</div><!-- /.tabs-panel -->
- <div class="tabs-panel <?php echo ( 'search' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>" id="tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
+ <div class="tabs-panel <?php echo ( 'search' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>" id="tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>" role="region" aria-label="<?php echo $taxonomy->labels->search_items; ?>" tabindex="0">
<?php
if ( isset( $_REQUEST[ 'quick-search-taxonomy-' . $taxonomy_name ] ) ) {
$searched = esc_attr( $_REQUEST[ 'quick-search-taxonomy-' . $taxonomy_name ] );
$search_results = get_terms(
- $taxonomy_name,
array(
+ 'taxonomy' => $taxonomy_name,
'name__like' => $searched,
'fields' => 'all',
'orderby' => 'count',
@@ -843,21 +889,10 @@
</ul>
</div><!-- /.tabs-panel -->
- <p class="button-controls wp-clearfix">
- <span class="list-controls">
- <a href="
- <?php
- echo esc_url(
- add_query_arg(
- array(
- $taxonomy_name . '-tab' => 'all',
- 'selectall' => 1,
- ),
- remove_query_arg( $removed_args )
- )
- );
- ?>
- #taxonomy-<?php echo $taxonomy_name; ?>" class="select-all aria-button-if-js"><?php _e( 'Select All' ); ?></a>
+ <p class="button-controls wp-clearfix" data-items-type="taxonomy-<?php echo esc_attr( $taxonomy_name ); ?>">
+ <span class="list-controls hide-if-no-js">
+ <input type="checkbox"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> id="<?php echo esc_attr( $tab_name ); ?>" class="select-all" />
+ <label for="<?php echo esc_attr( $tab_name ); ?>"><?php _e( 'Select All' ); ?></label>
</span>
<span class="add-to-menu">
@@ -894,8 +929,9 @@
// 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)
+ in_array( $_item_object_data['menu-item-url'], array( 'https://', 'http://', '' ), true ) ||
+ // Or it's not a custom menu item (but not the custom home page).
+ ! ( 'custom' === $_item_object_data['menu-item-type'] && ! isset( $_item_object_data['menu-item-db-id'] ) ) ||
// Or it *is* a custom menu item that already exists.
! empty( $_item_object_data['menu-item-db-id'] )
)
@@ -946,25 +982,25 @@
* @access private
*
* @param object $object The post type or taxonomy meta-object.
- * @return object The post type of taxonomy object.
+ * @return object The post type or taxonomy object.
*/
function _wp_nav_menu_meta_box_object( $object = null ) {
if ( isset( $object->name ) ) {
- if ( 'page' == $object->name ) {
+ if ( 'page' === $object->name ) {
$object->_default_query = array(
'orderby' => 'menu_order title',
'post_status' => 'publish',
);
// Posts should show only published items.
- } elseif ( 'post' == $object->name ) {
+ } elseif ( 'post' === $object->name ) {
$object->_default_query = array(
'post_status' => 'publish',
);
// Categories should be in reverse chronological order.
- } elseif ( 'category' == $object->name ) {
+ } elseif ( 'category' === $object->name ) {
$object->_default_query = array(
'orderby' => 'id',
'order' => 'DESC',
@@ -987,7 +1023,7 @@
* @since 3.0.0
*
* @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.
+ * @return string|WP_Error The menu formatted to edit or error object on failure.
*/
function wp_get_nav_menu_to_edit( $menu_id = 0 ) {
$menu = wp_get_nav_menu_object( $menu_id );
@@ -1019,17 +1055,18 @@
} else {
return new WP_Error(
'menu_walker_not_exist',
- /* translators: %s: walker class name */
sprintf(
+ /* translators: %s: Walker class name. */
__( 'The Walker class named %s does not exist.' ),
'<strong>' . $walker_class_name . '</strong>'
)
);
}
- $some_pending_menu_items = $some_invalid_menu_items = false;
+ $some_pending_menu_items = false;
+ $some_invalid_menu_items = false;
foreach ( (array) $menu_items as $menu_item ) {
- if ( isset( $menu_item->post_status ) && 'draft' == $menu_item->post_status ) {
+ if ( isset( $menu_item->post_status ) && 'draft' === $menu_item->post_status ) {
$some_pending_menu_items = true;
}
if ( ! empty( $menu_item->_invalid ) ) {
@@ -1060,7 +1097,7 @@
*
* @since 3.0.0
*
- * @return array Columns.
+ * @return string[] Array of column titles keyed by their column name.
*/
function wp_nav_menu_manage_columns() {
return array(
@@ -1099,9 +1136,9 @@
*
* @since 3.6.0
*
- * @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
+ * @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 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(
@@ -1113,9 +1150,11 @@
'post_status' => 'draft,publish',
)
);
- $messages = array();
- $menu_items = array();
- // Index menu items by db ID
+
+ $messages = array();
+ $menu_items = array();
+
+ // Index menu items by DB ID.
foreach ( $unsorted_menu_items as $_item ) {
$menu_items[ $_item->db_id ] = $_item;
}
@@ -1137,12 +1176,13 @@
);
wp_defer_term_counting( true );
- // Loop through all the menu items' POST variables
+
+ // Loop through all the menu items' POST variables.
if ( ! empty( $_POST['menu-item-db-id'] ) ) {
foreach ( (array) $_POST['menu-item-db-id'] as $_key => $k ) {
- // Menu item title can't be blank
- if ( ! isset( $_POST['menu-item-title'][ $_key ] ) || '' == $_POST['menu-item-title'][ $_key ] ) {
+ // Menu item title can't be blank.
+ if ( ! isset( $_POST['menu-item-title'][ $_key ] ) || '' === $_POST['menu-item-title'][ $_key ] ) {
continue;
}
@@ -1161,7 +1201,7 @@
}
}
- // Remove menu items from the menu that weren't in $_POST
+ // Remove menu items from the menu that weren't in $_POST.
if ( ! empty( $menu_items ) ) {
foreach ( array_keys( $menu_items ) as $menu_item_id ) {
if ( is_nav_menu_item( $menu_item_id ) ) {
@@ -1173,19 +1213,23 @@
// Store 'auto-add' pages.
$auto_add = ! empty( $_POST['auto-add-pages'] );
$nav_menu_option = (array) get_option( 'nav_menu_options' );
+
if ( ! isset( $nav_menu_option['auto_add'] ) ) {
$nav_menu_option['auto_add'] = array();
}
+
if ( $auto_add ) {
- if ( ! in_array( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) ) {
+ if ( ! in_array( $nav_menu_selected_id, $nav_menu_option['auto_add'], true ) ) {
$nav_menu_option['auto_add'][] = $nav_menu_selected_id;
}
} else {
- if ( false !== ( $key = array_search( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) ) ) {
+ $key = array_search( $nav_menu_selected_id, $nav_menu_option['auto_add'], true );
+ if ( false !== $key ) {
unset( $nav_menu_option['auto_add'][ $key ] );
}
}
- // Remove nonexistent/deleted menus
+
+ // Remove non-existent/deleted menus.
$nav_menu_option['auto_add'] = array_intersect( $nav_menu_option['auto_add'], wp_get_nav_menus( array( 'fields' => 'ids' ) ) );
update_option( 'nav_menu_options', $nav_menu_option );
@@ -1195,8 +1239,8 @@
do_action( 'wp_update_nav_menu', $nav_menu_selected_id );
$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' .
- /* translators: %s: nav menu title */
sprintf(
+ /* translators: %s: Nav menu title. */
__( '%s has been updated.' ),
'<strong>' . $nav_menu_selected_title . '</strong>'
) . '</p></div>';
@@ -1224,7 +1268,7 @@
if ( ! is_null( $data ) && $data ) {
foreach ( $data as $post_input_data ) {
// For input names that are arrays (e.g. `menu-item-db-id[3][4][5]`),
- // derive the array path keys via regex and set the value in $_POST.
+ // derive the array path keys via regex and set the value in $_POST.
preg_match( '#([^\[]*)(\[(.+)\])?#', $post_input_data->name, $matches );
$array_bits = array( $matches[1] );
@@ -1236,8 +1280,8 @@
$new_post_data = array();
// Build the new array value from leaf to trunk.
- for ( $i = count( $array_bits ) - 1; $i >= 0; $i -- ) {
- if ( $i == count( $array_bits ) - 1 ) {
+ for ( $i = count( $array_bits ) - 1; $i >= 0; $i-- ) {
+ if ( count( $array_bits ) - 1 == $i ) {
$new_post_data[ $array_bits[ $i ] ] = wp_slash( $post_input_data->value );
} else {
$new_post_data = array( $array_bits[ $i ] => $new_post_data );