--- a/wp/wp-includes/class-wp-customize-nav-menus.php Tue Oct 22 16:11:46 2019 +0200
+++ b/wp/wp-includes/class-wp-customize-nav-menus.php Tue Dec 15 13:49:49 2020 +0100
@@ -39,7 +39,7 @@
*
* @since 4.3.0
*
- * @param object $manager An instance of the WP_Customize_Manager class.
+ * @param WP_Customize_Manager $manager Customizer bootstrap instance.
*/
public function __construct( $manager ) {
$this->manager = $manager;
@@ -76,7 +76,7 @@
* @since 4.5.0
*
* @param string[] $nonces Array of nonces.
- * @return string[] $nonces Modified array of nonces.
+ * @return string[] Modified array of nonces.
*/
public function filter_nonces( $nonces ) {
$nonces['customize-menus'] = wp_create_nonce( 'customize-menus' );
@@ -135,7 +135,7 @@
* 'post_type' and 'taxonomy'. Default is 'post_type'.
* @param string $object Optional. Accepts any registered taxonomy or post type name. Default is 'page'.
* @param int $page Optional. The page number used to generate the query offset. Default is '0'.
- * @return WP_Error|array Returns either a WP_Error object or an array of menu items.
+ * @return array|WP_Error An array of menu items on success, a WP_Error object on failure.
*/
public function load_available_items_query( $type = 'post_type', $object = 'page', $page = 0 ) {
$items = array();
@@ -146,16 +146,48 @@
return new WP_Error( 'nav_menus_invalid_post_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();
+ $suppress_page_ids = array();
if ( 0 === $page && 'page' === $object ) {
- // Add "Home" link. Treat as a page, but switch to custom on add.
- $items[] = array(
- 'id' => 'home',
- 'title' => _x( 'Home', 'nav menu home label' ),
- 'type' => 'custom',
- 'type_label' => __( 'Custom Link' ),
- 'object' => '',
- 'url' => home_url(),
- );
+ // Insert Front Page or custom "Home" link.
+ $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 );
+ $important_pages[] = $front_page_obj;
+ $suppress_page_ids[] = $front_page_obj->ID;
+ } else {
+ // Add "Home" link. Treat as a page, but switch to custom on add.
+ $items[] = array(
+ 'id' => 'home',
+ 'title' => _x( 'Home', 'nav menu home label' ),
+ 'type' => 'custom',
+ 'type_label' => __( 'Custom Link' ),
+ 'object' => '',
+ 'url' => home_url(),
+ );
+ }
+
+ // 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 );
+ $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 ) {
+ $important_pages[] = $privacy_policy_page;
+ $suppress_page_ids[] = $privacy_policy_page->ID;
+ }
+ }
} elseif ( 'post' !== $object && 0 === $page && $post_type->has_archive ) {
// Add a post type archive link.
$items[] = array(
@@ -179,30 +211,43 @@
}
}
+ $args = array(
+ 'numberposts' => 10,
+ 'offset' => 10 * $page,
+ 'orderby' => 'date',
+ 'order' => 'DESC',
+ 'post_type' => $object,
+ );
+
+ // Add suppression array to arguments for get_posts.
+ if ( ! empty( $suppress_page_ids ) ) {
+ $args['post__not_in'] = $suppress_page_ids;
+ }
+
$posts = array_merge(
$posts,
- get_posts(
- array(
- 'numberposts' => 10,
- 'offset' => 10 * $page,
- 'orderby' => 'date',
- 'order' => 'DESC',
- 'post_type' => $object,
- )
- )
+ $important_pages,
+ get_posts( $args )
);
foreach ( $posts as $post ) {
$post_title = $post->post_title;
if ( '' === $post_title ) {
- /* translators: %d: ID of a post */
+ /* translators: %d: ID of a post. */
$post_title = sprintf( __( '#%d (no title)' ), $post->ID );
}
+
+ $post_type_label = get_post_type_object( $post->post_type )->labels->singular_name;
+ $post_states = get_post_states( $post );
+ if ( ! empty( $post_states ) ) {
+ $post_type_label = implode( ',', $post_states );
+ }
+
$items[] = array(
'id' => "post-{$post->ID}",
'title' => html_entity_decode( $post_title, ENT_QUOTES, get_bloginfo( 'charset' ) ),
'type' => 'post_type',
- 'type_label' => get_post_type_object( $post->post_type )->labels->singular_name,
+ 'type_label' => $post_type_label,
'object' => $post->post_type,
'object_id' => intval( $post->ID ),
'url' => get_permalink( intval( $post->ID ) ),
@@ -210,8 +255,8 @@
}
} elseif ( 'taxonomy' === $type ) {
$terms = get_terms(
- $object,
array(
+ 'taxonomy' => $object,
'child_of' => 0,
'exclude' => '',
'hide_empty' => false,
@@ -224,6 +269,7 @@
'pad_counts' => false,
)
);
+
if ( is_wp_error( $terms ) ) {
return $terms;
}
@@ -348,14 +394,21 @@
foreach ( $posts as $post ) {
$post_title = $post->post_title;
if ( '' === $post_title ) {
- /* translators: %d: ID of a post */
+ /* translators: %d: ID of a post. */
$post_title = sprintf( __( '#%d (no title)' ), $post->ID );
}
+
+ $post_type_label = $post_type_objects[ $post->post_type ]->labels->singular_name;
+ $post_states = get_post_states( $post );
+ if ( ! empty( $post_states ) ) {
+ $post_type_label = implode( ',', $post_states );
+ }
+
$items[] = array(
'id' => 'post-' . $post->ID,
'title' => html_entity_decode( $post_title, ENT_QUOTES, get_bloginfo( 'charset' ) ),
'type' => 'post_type',
- 'type_label' => $post_type_objects[ $post->post_type ]->labels->singular_name,
+ 'type_label' => $post_type_label,
'object' => $post->post_type,
'object_id' => intval( $post->ID ),
'url' => get_permalink( intval( $post->ID ) ),
@@ -365,10 +418,11 @@
// Query taxonomy terms.
$taxonomies = get_taxonomies( array( 'show_in_nav_menus' => true ), 'names' );
$terms = get_terms(
- $taxonomies,
array(
+ 'taxonomies' => $taxonomies,
'name__like' => $args['s'],
'number' => 20,
+ 'hide_empty' => false,
'offset' => 20 * ( $args['pagenum'] - 1 ),
)
);
@@ -390,17 +444,21 @@
// Add "Home" link if search term matches. Treat as a page, but switch to custom on add.
if ( isset( $args['s'] ) ) {
- $title = _x( 'Home', 'nav menu home label' );
- $matches = function_exists( 'mb_stripos' ) ? false !== mb_stripos( $title, $args['s'] ) : false !== stripos( $title, $args['s'] );
- if ( $matches ) {
- $items[] = array(
- 'id' => 'home',
- 'title' => $title,
- 'type' => 'custom',
- 'type_label' => __( 'Custom Link' ),
- 'object' => '',
- 'url' => home_url(),
- );
+ // Only insert custom "Home" link if there's no Front Page
+ $front_page = 'page' === get_option( 'show_on_front' ) ? (int) get_option( 'page_on_front' ) : 0;
+ if ( empty( $front_page ) ) {
+ $title = _x( 'Home', 'nav menu home label' );
+ $matches = function_exists( 'mb_stripos' ) ? false !== mb_stripos( $title, $args['s'] ) : false !== stripos( $title, $args['s'] );
+ if ( $matches ) {
+ $items[] = array(
+ 'id' => 'home',
+ 'title' => $title,
+ 'type' => 'custom',
+ 'type_label' => __( 'Custom Link' ),
+ 'object' => '',
+ 'url' => home_url(),
+ );
+ }
}
}
@@ -433,7 +491,7 @@
if ( 1 === $num_locations ) {
$locations_description = __( 'Your theme can display menus in one location.' );
} else {
- /* translators: %s: number of menu locations */
+ /* translators: %s: Number of menu locations. */
$locations_description = sprintf( _n( 'Your theme can display menus in %s location.', 'Your theme can display menus in %s locations.', $num_locations ), number_format_i18n( $num_locations ) );
}
@@ -446,7 +504,7 @@
'unnamed' => _x( '(unnamed)', 'Missing menu name.' ),
'custom_label' => __( 'Custom Link' ),
'page_label' => get_post_type_object( 'page' )->labels->singular_name,
- /* translators: %s: menu location */
+ /* translators: %s: Menu location. */
'menuLocation' => _x( '(Currently set to: %s)', 'menu' ),
'locationsTitle' => 1 === $num_locations ? __( 'Menu Location' ) : __( 'Menu Locations' ),
'locationsDescription' => $locations_description,
@@ -460,13 +518,15 @@
'movedDown' => __( 'Menu item moved down' ),
'movedLeft' => __( 'Menu item moved out of submenu' ),
'movedRight' => __( 'Menu item is now a sub-item' ),
- /* translators: ▸ is the unicode right-pointing triangle, and %s is the section title in the Customizer */
+ /* translators: ▸ is the unicode right-pointing triangle. %s: Section title in the Customizer. */
'customizingMenus' => sprintf( __( 'Customizing ▸ %s' ), esc_html( $this->manager->get_panel( 'nav_menus' )->title ) ),
- /* translators: %s: title of menu item which is invalid */
+ /* translators: %s: Title of an invalid menu item. */
'invalidTitleTpl' => __( '%s (Invalid)' ),
- /* translators: %s: title of menu item in draft status */
+ /* translators: %s: Title of a menu item in draft status. */
'pendingTitleTpl' => __( '%s (Pending)' ),
+ /* translators: %d: Number of menu items found. */
'itemsFound' => __( 'Number of items found: %d' ),
+ /* translators: %d: Number of additional menu items found. */
'itemsFoundMore' => __( 'Additional items found: %d' ),
'itemsLoadingMore' => __( 'Loading more results... please wait.' ),
'reorderModeOn' => __( 'Reorder mode enabled' ),
@@ -492,17 +552,17 @@
'moveUp' => __( 'Move up one' ),
'moveDown' => __( 'Move down one' ),
'moveToTop' => __( 'Move to the top' ),
- /* translators: %s: previous item name */
+ /* translators: %s: Previous item name. */
'moveUnder' => __( 'Move under %s' ),
- /* translators: %s: previous item name */
+ /* translators: %s: Previous item name. */
'moveOutFrom' => __( 'Move out from under %s' ),
- /* translators: %s: previous item name */
+ /* translators: %s: Previous item name. */
'under' => __( 'Under %s' ),
- /* translators: %s: previous item name */
+ /* translators: %s: Previous item name. */
'outFrom' => __( 'Out from under %s' ),
- /* translators: 1: item name, 2: item position, 3: total number of items */
+ /* translators: 1: Item name, 2: Item position, 3: Total number of items. */
'menuFocus' => __( '%1$s. Menu item %2$d of %3$d.' ),
- /* translators: 1: item name, 2: item position, 3: parent item name */
+ /* translators: 1: Item name, 2: Item position, 3: Parent item name. */
'subMenuFocus' => __( '%1$s. Sub item number %2$d under %3$s.' ),
);
wp_localize_script( 'nav-menu', 'menus', $nav_menus_l10n );
@@ -590,8 +650,11 @@
// Create a panel for Menus.
$description = '<p>' . __( 'This panel is used for managing navigation menus for content you have already published on your site. You can create menus and add items for existing content such as pages, posts, categories, tags, formats, or custom links.' ) . '</p>';
if ( current_theme_supports( 'widgets' ) ) {
- /* translators: URL to the widgets panel of the customizer */
- $description .= '<p>' . sprintf( __( 'Menus can be displayed in locations defined by your theme or in <a href="%s">widget areas</a> by adding a “Navigation Menu” widget.' ), "javascript:wp.customize.panel( 'widgets' ).focus();" ) . '</p>';
+ $description .= '<p>' . sprintf(
+ /* translators: %s: URL to the Widgets panel of the Customizer. */
+ __( 'Menus can be displayed in locations defined by your theme or in <a href="%s">widget areas</a> by adding a “Navigation Menu” widget.' ),
+ "javascript:wp.customize.panel( 'widgets' ).focus();"
+ ) . '</p>';
} else {
$description .= '<p>' . __( 'Menus can be displayed in locations defined by your theme.' ) . '</p>';
}
@@ -619,12 +682,12 @@
if ( 1 == $num_locations ) {
$description = '<p>' . __( 'Your theme can display menus in one location. Select which menu you would like to use.' ) . '</p>';
} else {
- /* translators: %s: number of menu locations */
+ /* translators: %s: Number of menu locations. */
$description = '<p>' . sprintf( _n( 'Your theme can display menus in %s location. Select which menu you would like to use.', 'Your theme can display menus in %s locations. Select which menu appears in each location.', $num_locations ), number_format_i18n( $num_locations ) ) . '</p>';
}
if ( current_theme_supports( 'widgets' ) ) {
- /* translators: URL to the widgets panel of the customizer */
+ /* translators: URL to the Widgets panel of the Customizer. */
$description .= '<p>' . sprintf( __( 'If your theme has widget areas, you can also add menus there. Visit the <a href="%s">Widgets panel</a> and add a “Navigation Menu widget” to display a menu in a sidebar or footer.' ), "javascript:wp.customize.panel( 'widgets' ).focus();" ) . '</p>';
}
@@ -696,6 +759,11 @@
);
}
+ // Used to denote post states for special pages.
+ if ( ! function_exists( 'get_post_states' ) ) {
+ require_once ABSPATH . 'wp-admin/includes/template.php';
+ }
+
// Register each menu as a Customizer section, and add each menu item to each menu.
foreach ( $menus as $menu ) {
$menu_id = $menu->term_id;
@@ -878,10 +946,10 @@
return new WP_Error( 'unknown_post_type', __( 'Invalid post type.' ) );
}
if ( empty( $postarr['post_title'] ) ) {
- return new WP_Error( 'empty_title', __( 'Empty title' ) );
+ return new WP_Error( 'empty_title', __( 'Empty title.' ) );
}
if ( ! empty( $postarr['post_status'] ) ) {
- return new WP_Error( 'status_forbidden', __( 'Status is forbidden' ) );
+ return new WP_Error( 'status_forbidden', __( 'Status is forbidden.' ) );
}
/*
@@ -971,7 +1039,7 @@
}
$data = array(
- /* translators: 1: post type name, 2: error message */
+ /* translators: 1: Post type name, 2: Error message. */
'message' => sprintf( __( '%1$s could not be created: %2$s' ), $singular_name, $error->get_error_message() ),
);
wp_send_json_error( $data );
@@ -1005,7 +1073,7 @@
<button type="button" class="button-link item-add">
<span class="screen-reader-text">
<?php
- /* translators: 1: title of a menu item, 2: type of a menu item */
+ /* translators: 1: Title of a menu item, 2: Type of a menu item. */
printf( __( 'Add to menu: %1$s (%2$s)' ), '{{ data.title || wp.customize.Menus.data.l10n.untitled }}', '{{ data.type_label }}' );
?>
</span>
@@ -1064,7 +1132,7 @@
}
/**
- * Print the html template used to render the add-menu-item frame.
+ * Print the HTML template used to render the add-menu-item frame.
*
* @since 4.3.0
*/
@@ -1078,7 +1146,7 @@
<h3>
<span class="customize-action">
<?php
- /* translators: ▸ is the unicode right-pointing triangle, and %s is the section title in the Customizer */
+ /* translators: ▸ is the unicode right-pointing triangle. %s: Section title in the Customizer. */
printf( __( 'Customizing ▸ %s' ), esc_html( $this->manager->get_panel( 'nav_menus' )->title ) );
?>
</span>
@@ -1142,7 +1210,7 @@
<button type="button" class="button-link" aria-expanded="false">
<span class="screen-reader-text">
<?php
- /* translators: %s: Title of a section with menu items */
+ /* translators: %s: Title of a section with menu items. */
printf( __( 'Toggle section: %s' ), esc_html( $available_item_type['title'] ) );
?>
</span>
@@ -1187,7 +1255,7 @@
<input type="hidden" value="custom" id="custom-menu-item-type" name="menu-item[-1][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[-1][menu-item-url]" type="text" class="code menu-item-textbox" value="http://">
+ <input id="custom-menu-item-url" name="menu-item[-1][menu-item-url]" type="text" 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>
@@ -1277,7 +1345,7 @@
* @since 4.7.0
*
* @param array $value Post IDs.
- * @returns array Post IDs.
+ * @return array Post IDs.
*/
public function sanitize_nav_menus_created_posts( $value ) {
$post_ids = array();
@@ -1293,7 +1361,7 @@
if ( ! $post_type_obj ) {
continue;
}
- if ( ! current_user_can( $post_type_obj->cap->publish_posts ) || ! current_user_can( $post_type_obj->cap->edit_post, $post_id ) ) {
+ if ( ! current_user_can( $post_type_obj->cap->publish_posts ) || ! current_user_can( 'edit_post', $post_id ) ) {
continue;
}
$post_ids[] = $post->ID;
@@ -1346,6 +1414,7 @@
* Keep track of the arguments that are being passed to wp_nav_menu().
*
* @since 4.3.0
+ *
* @see wp_nav_menu()
* @see WP_Customize_Widgets::filter_dynamic_sidebar_params()
*