diff -r c7c34916027a -r 177826044cd9 wp/wp-admin/menu.php --- a/wp/wp-admin/menu.php Mon Oct 14 18:06:33 2019 +0200 +++ b/wp/wp-admin/menu.php Mon Oct 14 18:28:13 2019 +0200 @@ -20,12 +20,12 @@ * @global array $menu */ -$menu[2] = array( __('Dashboard'), 'read', 'index.php', '', 'menu-top menu-top-first menu-icon-dashboard', 'menu-dashboard', 'dashicons-dashboard' ); +$menu[2] = array( __( 'Dashboard' ), 'read', 'index.php', '', 'menu-top menu-top-first menu-icon-dashboard', 'menu-dashboard', 'dashicons-dashboard' ); -$submenu[ 'index.php' ][0] = array( __('Home'), 'read', 'index.php' ); +$submenu['index.php'][0] = array( __( 'Home' ), 'read', 'index.php' ); if ( is_multisite() ) { - $submenu[ 'index.php' ][5] = array( __('My Sites'), 'read', 'my-sites.php' ); + $submenu['index.php'][5] = array( __( 'My Sites' ), 'read', 'my-sites.php' ); } if ( ! is_multisite() || current_user_can( 'update_core' ) ) { @@ -42,7 +42,8 @@ } else { $cap = 'update_languages'; } - $submenu[ 'index.php' ][10] = array( sprintf( __('Updates %s'), "" . number_format_i18n($update_data['counts']['total']) . "" ), $cap, 'update-core.php'); + /* translators: %s: number of pending updates */ + $submenu['index.php'][10] = array( sprintf( __( 'Updates %s' ), "" . number_format_i18n( $update_data['counts']['total'] ) . '' ), $cap, 'update-core.php' ); unset( $cap ); } @@ -50,33 +51,39 @@ // $menu[5] = Posts -$menu[10] = array( __('Media'), 'upload_files', 'upload.php', '', 'menu-top menu-icon-media', 'menu-media', 'dashicons-admin-media' ); - $submenu['upload.php'][5] = array( __('Library'), 'upload_files', 'upload.php'); +$menu[10] = array( __( 'Media' ), 'upload_files', 'upload.php', '', 'menu-top menu-icon-media', 'menu-media', 'dashicons-admin-media' ); + $submenu['upload.php'][5] = array( __( 'Library' ), 'upload_files', 'upload.php' ); /* translators: add new file */ - $submenu['upload.php'][10] = array( _x('Add New', 'file'), 'upload_files', 'media-new.php'); - $i = 15; - foreach ( get_taxonomies_for_attachments( 'objects' ) as $tax ) { - if ( ! $tax->show_ui || ! $tax->show_in_menu ) - continue; + $submenu['upload.php'][10] = array( _x( 'Add New', 'file' ), 'upload_files', 'media-new.php' ); + $i = 15; +foreach ( get_taxonomies_for_attachments( 'objects' ) as $tax ) { + if ( ! $tax->show_ui || ! $tax->show_in_menu ) { + continue; + } - $submenu['upload.php'][$i++] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, 'edit-tags.php?taxonomy=' . $tax->name . '&post_type=attachment' ); - } + $submenu['upload.php'][ $i++ ] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, 'edit-tags.php?taxonomy=' . $tax->name . '&post_type=attachment' ); +} unset( $tax, $i ); -$menu[15] = array( __('Links'), 'manage_links', 'link-manager.php', '', 'menu-top menu-icon-links', 'menu-links', 'dashicons-admin-links' ); - $submenu['link-manager.php'][5] = array( _x('All Links', 'admin menu'), 'manage_links', 'link-manager.php' ); +$menu[15] = array( __( 'Links' ), 'manage_links', 'link-manager.php', '', 'menu-top menu-icon-links', 'menu-links', 'dashicons-admin-links' ); + $submenu['link-manager.php'][5] = array( _x( 'All Links', 'admin menu' ), 'manage_links', 'link-manager.php' ); /* translators: add new links */ - $submenu['link-manager.php'][10] = array( _x('Add New', 'link'), 'manage_links', 'link-add.php' ); - $submenu['link-manager.php'][15] = array( __('Link Categories'), 'manage_categories', 'edit-tags.php?taxonomy=link_category' ); + $submenu['link-manager.php'][10] = array( _x( 'Add New', 'link' ), 'manage_links', 'link-add.php' ); + $submenu['link-manager.php'][15] = array( __( 'Link Categories' ), 'manage_categories', 'edit-tags.php?taxonomy=link_category' ); // $menu[20] = Pages // Avoid the comment count query for users who cannot edit_posts. if ( current_user_can( 'edit_posts' ) ) { - $awaiting_mod = wp_count_comments(); - $awaiting_mod = $awaiting_mod->moderated; + $awaiting_mod = wp_count_comments(); + $awaiting_mod = $awaiting_mod->moderated; + $awaiting_mod_i18n = number_format_i18n( $awaiting_mod ); + /* translators: %s: number of comments in moderation */ + $awaiting_mod_text = sprintf( _n( '%s Comment in moderation', '%s Comments in moderation', $awaiting_mod ), $awaiting_mod_i18n ); + $menu[25] = array( - sprintf( __( 'Comments %s' ), '' . number_format_i18n( $awaiting_mod ) . '' ), + /* translators: %s: number of comments in moderation */ + sprintf( __( 'Comments %s' ), '' . $awaiting_mod_text . '' ), 'edit_posts', 'edit-comments.php', '', @@ -87,19 +94,26 @@ unset( $awaiting_mod ); } -$submenu[ 'edit-comments.php' ][0] = array( __('All Comments'), 'edit_posts', 'edit-comments.php' ); +$submenu['edit-comments.php'][0] = array( __( 'All Comments' ), 'edit_posts', 'edit-comments.php' ); $_wp_last_object_menu = 25; // The index of the last top-level menu in the object menu group -$types = (array) get_post_types( array('show_ui' => true, '_builtin' => false, 'show_in_menu' => true ) ); +$types = (array) get_post_types( + array( + 'show_ui' => true, + '_builtin' => false, + 'show_in_menu' => true, + ) +); $builtin = array( 'post', 'page' ); foreach ( array_merge( $builtin, $types ) as $ptype ) { $ptype_obj = get_post_type_object( $ptype ); // Check if it should be a submenu. - if ( $ptype_obj->show_in_menu !== true ) + if ( $ptype_obj->show_in_menu !== true ) { continue; + } $ptype_menu_position = is_int( $ptype_obj->menu_position ) ? $ptype_obj->menu_position : ++$_wp_last_object_menu; // If we're to use $_wp_last_object_menu, increment it first. - $ptype_for_id = sanitize_html_class( $ptype ); + $ptype_for_id = sanitize_html_class( $ptype ); $menu_icon = 'dashicons-admin-post'; if ( is_string( $ptype_obj->menu_icon ) ) { @@ -116,13 +130,13 @@ $menu_class = 'menu-top menu-icon-' . $ptype_for_id; // 'post' special case if ( 'post' === $ptype ) { - $menu_class .= ' open-if-no-js'; - $ptype_file = "edit.php"; - $post_new_file = "post-new.php"; - $edit_tags_file = "edit-tags.php?taxonomy=%s"; + $menu_class .= ' open-if-no-js'; + $ptype_file = 'edit.php'; + $post_new_file = 'post-new.php'; + $edit_tags_file = 'edit-tags.php?taxonomy=%s'; } else { - $ptype_file = "edit.php?post_type=$ptype"; - $post_new_file = "post-new.php?post_type=$ptype"; + $ptype_file = "edit.php?post_type=$ptype"; + $post_new_file = "post-new.php?post_type=$ptype"; $edit_tags_file = "edit-tags.php?taxonomy=%s&post_type=$ptype"; } @@ -135,47 +149,49 @@ * If $ptype_menu_position is already populated or will be populated * by a hard-coded value below, increment the position. */ - $core_menu_positions = array(59, 60, 65, 70, 75, 80, 85, 99); - while ( isset($menu[$ptype_menu_position]) || in_array($ptype_menu_position, $core_menu_positions) ) + $core_menu_positions = array( 59, 60, 65, 70, 75, 80, 85, 99 ); + while ( isset( $menu[ $ptype_menu_position ] ) || in_array( $ptype_menu_position, $core_menu_positions ) ) { $ptype_menu_position++; + } - $menu[$ptype_menu_position] = array( esc_attr( $ptype_obj->labels->menu_name ), $ptype_obj->cap->edit_posts, $ptype_file, '', $menu_class, $ptype_menu_id, $menu_icon ); - $submenu[ $ptype_file ][5] = array( $ptype_obj->labels->all_items, $ptype_obj->cap->edit_posts, $ptype_file ); - $submenu[ $ptype_file ][10] = array( $ptype_obj->labels->add_new, $ptype_obj->cap->create_posts, $post_new_file ); + $menu[ $ptype_menu_position ] = array( esc_attr( $ptype_obj->labels->menu_name ), $ptype_obj->cap->edit_posts, $ptype_file, '', $menu_class, $ptype_menu_id, $menu_icon ); + $submenu[ $ptype_file ][5] = array( $ptype_obj->labels->all_items, $ptype_obj->cap->edit_posts, $ptype_file ); + $submenu[ $ptype_file ][10] = array( $ptype_obj->labels->add_new, $ptype_obj->cap->create_posts, $post_new_file ); $i = 15; foreach ( get_taxonomies( array(), 'objects' ) as $tax ) { - if ( ! $tax->show_ui || ! $tax->show_in_menu || ! in_array($ptype, (array) $tax->object_type, true) ) + if ( ! $tax->show_ui || ! $tax->show_in_menu || ! in_array( $ptype, (array) $tax->object_type, true ) ) { continue; + } - $submenu[ $ptype_file ][$i++] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, sprintf( $edit_tags_file, $tax->name ) ); + $submenu[ $ptype_file ][ $i++ ] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, sprintf( $edit_tags_file, $tax->name ) ); } } unset( $ptype, $ptype_obj, $ptype_for_id, $ptype_menu_position, $menu_icon, $i, $tax, $post_new_file ); $menu[59] = array( '', 'read', 'separator2', '', 'wp-menu-separator' ); -$appearance_cap = current_user_can( 'switch_themes') ? 'switch_themes' : 'edit_theme_options'; +$appearance_cap = current_user_can( 'switch_themes' ) ? 'switch_themes' : 'edit_theme_options'; -$menu[60] = array( __( 'Appearance' ), $appearance_cap, 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'dashicons-admin-appearance' ); +$menu[60] = array( __( 'Appearance' ), $appearance_cap, 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'dashicons-admin-appearance' ); $submenu['themes.php'][5] = array( __( 'Themes' ), $appearance_cap, 'themes.php' ); - $customize_url = add_query_arg( 'return', urlencode( remove_query_arg( wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI'] ) ) ), 'customize.php' ); + $customize_url = add_query_arg( 'return', urlencode( remove_query_arg( wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI'] ) ) ), 'customize.php' ); $submenu['themes.php'][6] = array( __( 'Customize' ), 'customize', esc_url( $customize_url ), '', 'hide-if-no-customize' ); - if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) ) { - $submenu['themes.php'][10] = array( __( 'Menus' ), 'edit_theme_options', 'nav-menus.php' ); - } +if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) ) { + $submenu['themes.php'][10] = array( __( 'Menus' ), 'edit_theme_options', 'nav-menus.php' ); +} - if ( current_theme_supports( 'custom-header' ) && current_user_can( 'customize') ) { - $customize_header_url = add_query_arg( array( 'autofocus' => array( 'control' => 'header_image' ) ), $customize_url ); - $submenu['themes.php'][15] = array( __( 'Header' ), $appearance_cap, esc_url( $customize_header_url ), '', 'hide-if-no-customize' ); - } +if ( current_theme_supports( 'custom-header' ) && current_user_can( 'customize' ) ) { + $customize_header_url = add_query_arg( array( 'autofocus' => array( 'control' => 'header_image' ) ), $customize_url ); + $submenu['themes.php'][15] = array( __( 'Header' ), $appearance_cap, esc_url( $customize_header_url ), '', 'hide-if-no-customize' ); +} - if ( current_theme_supports( 'custom-background' ) && current_user_can( 'customize') ) { - $customize_background_url = add_query_arg( array( 'autofocus' => array( 'control' => 'background_image' ) ), $customize_url ); - $submenu['themes.php'][20] = array( __( 'Background' ), $appearance_cap, esc_url( $customize_background_url ), '', 'hide-if-no-customize' ); - } +if ( current_theme_supports( 'custom-background' ) && current_user_can( 'customize' ) ) { + $customize_background_url = add_query_arg( array( 'autofocus' => array( 'control' => 'background_image' ) ), $customize_url ); + $submenu['themes.php'][20] = array( __( 'Background' ), $appearance_cap, esc_url( $customize_background_url ), '', 'hide-if-no-customize' ); +} unset( $customize_url ); @@ -183,7 +199,7 @@ // Add 'Editor' to the bottom of the Appearance menu. if ( ! is_multisite() ) { - add_action('admin_menu', '_add_themes_utility_last', 101); + add_action( 'admin_menu', '_add_themes_utility_last', 101 ); } /** * Adds the (theme) 'Editor' link to the bottom of the Appearance menu. @@ -193,102 +209,101 @@ */ function _add_themes_utility_last() { // Must use API on the admin_menu hook, direct modification is only possible on/before the _admin_menu hook - add_submenu_page('themes.php', _x('Editor', 'theme editor'), _x('Editor', 'theme editor'), 'edit_themes', 'theme-editor.php'); + add_submenu_page( 'themes.php', __( 'Theme Editor' ), __( 'Theme Editor' ), 'edit_themes', 'theme-editor.php' ); } $count = ''; if ( ! is_multisite() && current_user_can( 'update_plugins' ) ) { - if ( ! isset( $update_data ) ) + if ( ! isset( $update_data ) ) { $update_data = wp_get_update_data(); - $count = "" . number_format_i18n($update_data['counts']['plugins']) . ""; + } + $count = "" . number_format_i18n( $update_data['counts']['plugins'] ) . ''; } -$menu[65] = array( sprintf( __('Plugins %s'), $count ), 'activate_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'dashicons-admin-plugins' ); +/* translators: %s: number of pending plugin updates */ +$menu[65] = array( sprintf( __( 'Plugins %s' ), $count ), 'activate_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'dashicons-admin-plugins' ); -$submenu['plugins.php'][5] = array( __('Installed Plugins'), 'activate_plugins', 'plugins.php' ); +$submenu['plugins.php'][5] = array( __( 'Installed Plugins' ), 'activate_plugins', 'plugins.php' ); - if ( ! is_multisite() ) { - /* translators: add new plugin */ - $submenu['plugins.php'][10] = array( _x('Add New', 'plugin'), 'install_plugins', 'plugin-install.php' ); - $submenu['plugins.php'][15] = array( _x('Editor', 'plugin editor'), 'edit_plugins', 'plugin-editor.php' ); - } +if ( ! is_multisite() ) { + /* translators: add new plugin */ + $submenu['plugins.php'][10] = array( _x( 'Add New', 'plugin' ), 'install_plugins', 'plugin-install.php' ); + $submenu['plugins.php'][15] = array( __( 'Plugin Editor' ), 'edit_plugins', 'plugin-editor.php' ); +} unset( $update_data ); -if ( current_user_can('list_users') ) - $menu[70] = array( __('Users'), 'list_users', 'users.php', '', 'menu-top menu-icon-users', 'menu-users', 'dashicons-admin-users' ); -else - $menu[70] = array( __('Profile'), 'read', 'profile.php', '', 'menu-top menu-icon-users', 'menu-users', 'dashicons-admin-users' ); +if ( current_user_can( 'list_users' ) ) { + $menu[70] = array( __( 'Users' ), 'list_users', 'users.php', '', 'menu-top menu-icon-users', 'menu-users', 'dashicons-admin-users' ); +} else { + $menu[70] = array( __( 'Profile' ), 'read', 'profile.php', '', 'menu-top menu-icon-users', 'menu-users', 'dashicons-admin-users' ); +} -if ( current_user_can('list_users') ) { +if ( current_user_can( 'list_users' ) ) { $_wp_real_parent_file['profile.php'] = 'users.php'; // Back-compat for plugins adding submenus to profile.php. - $submenu['users.php'][5] = array(__('All Users'), 'list_users', 'users.php'); + $submenu['users.php'][5] = array( __( 'All Users' ), 'list_users', 'users.php' ); if ( current_user_can( 'create_users' ) ) { - $submenu['users.php'][10] = array(_x('Add New', 'user'), 'create_users', 'user-new.php'); + $submenu['users.php'][10] = array( _x( 'Add New', 'user' ), 'create_users', 'user-new.php' ); } elseif ( is_multisite() ) { - $submenu['users.php'][10] = array(_x('Add New', 'user'), 'promote_users', 'user-new.php'); + $submenu['users.php'][10] = array( _x( 'Add New', 'user' ), 'promote_users', 'user-new.php' ); } - $submenu['users.php'][15] = array(__('Your Profile'), 'read', 'profile.php'); + $submenu['users.php'][15] = array( __( 'Your Profile' ), 'read', 'profile.php' ); } else { $_wp_real_parent_file['users.php'] = 'profile.php'; - $submenu['profile.php'][5] = array(__('Your Profile'), 'read', 'profile.php'); + $submenu['profile.php'][5] = array( __( 'Your Profile' ), 'read', 'profile.php' ); if ( current_user_can( 'create_users' ) ) { - $submenu['profile.php'][10] = array(__('Add New User'), 'create_users', 'user-new.php'); + $submenu['profile.php'][10] = array( __( 'Add New User' ), 'create_users', 'user-new.php' ); } elseif ( is_multisite() ) { - $submenu['profile.php'][10] = array(__('Add New User'), 'promote_users', 'user-new.php'); + $submenu['profile.php'][10] = array( __( 'Add New User' ), 'promote_users', 'user-new.php' ); } } -$menu[75] = array( __('Tools'), 'edit_posts', 'tools.php', '', 'menu-top menu-icon-tools', 'menu-tools', 'dashicons-admin-tools' ); - $submenu['tools.php'][5] = array( __('Available Tools'), 'edit_posts', 'tools.php' ); - $submenu['tools.php'][10] = array( __('Import'), 'import', 'import.php' ); - $submenu['tools.php'][15] = array( __('Export'), 'export', 'export.php' ); - if ( is_multisite() && !is_main_site() ) - $submenu['tools.php'][25] = array( __('Delete Site'), 'delete_site', 'ms-delete-site.php' ); - if ( ! is_multisite() && defined('WP_ALLOW_MULTISITE') && WP_ALLOW_MULTISITE ) - $submenu['tools.php'][50] = array(__('Network Setup'), 'setup_network', 'network.php'); - -$change_notice = ''; -if ( current_user_can( 'manage_privacy_options' ) && WP_Privacy_Policy_Content::text_change_check() ) { - $change_notice = ' ' . number_format_i18n( 1 ) . ''; +$menu[75] = array( __( 'Tools' ), 'edit_posts', 'tools.php', '', 'menu-top menu-icon-tools', 'menu-tools', 'dashicons-admin-tools' ); + $submenu['tools.php'][5] = array( __( 'Available Tools' ), 'edit_posts', 'tools.php' ); + $submenu['tools.php'][10] = array( __( 'Import' ), 'import', 'import.php' ); + $submenu['tools.php'][15] = array( __( 'Export' ), 'export', 'export.php' ); + $submenu['tools.php'][20] = array( __( 'Site Health' ), 'view_site_health_checks', 'site-health.php' ); +if ( is_multisite() && ! is_main_site() ) { + $submenu['tools.php'][25] = array( __( 'Delete Site' ), 'delete_site', 'ms-delete-site.php' ); +} +if ( ! is_multisite() && defined( 'WP_ALLOW_MULTISITE' ) && WP_ALLOW_MULTISITE ) { + $submenu['tools.php'][50] = array( __( 'Network Setup' ), 'setup_network', 'network.php' ); } -// translators: %s is the update notification bubble, if updates are available. -$menu[80] = array( sprintf( __( 'Settings %s' ), $change_notice ), 'manage_options', 'options-general.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'dashicons-admin-settings' ); +$menu[80] = array( __( 'Settings' ), 'manage_options', 'options-general.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'dashicons-admin-settings' ); $submenu['options-general.php'][10] = array( _x( 'General', 'settings screen' ), 'manage_options', 'options-general.php' ); $submenu['options-general.php'][15] = array( __( 'Writing' ), 'manage_options', 'options-writing.php' ); $submenu['options-general.php'][20] = array( __( 'Reading' ), 'manage_options', 'options-reading.php' ); $submenu['options-general.php'][25] = array( __( 'Discussion' ), 'manage_options', 'options-discussion.php' ); $submenu['options-general.php'][30] = array( __( 'Media' ), 'manage_options', 'options-media.php' ); $submenu['options-general.php'][40] = array( __( 'Permalinks' ), 'manage_options', 'options-permalink.php' ); - // translators: %s is the update notification bubble, if updates are available. - $submenu['options-general.php'][45] = array( sprintf( __( 'Privacy %s' ), $change_notice ), 'manage_privacy_options', 'privacy.php' ); + $submenu['options-general.php'][45] = array( __( 'Privacy' ), 'manage_privacy_options', 'privacy.php' ); $_wp_last_utility_menu = 80; // The index of the last top-level menu in the utility menu group $menu[99] = array( '', 'read', 'separator-last', '', 'wp-menu-separator' ); // Back-compat for old top-levels -$_wp_real_parent_file['post.php'] = 'edit.php'; -$_wp_real_parent_file['post-new.php'] = 'edit.php'; +$_wp_real_parent_file['post.php'] = 'edit.php'; +$_wp_real_parent_file['post-new.php'] = 'edit.php'; $_wp_real_parent_file['edit-pages.php'] = 'edit.php?post_type=page'; -$_wp_real_parent_file['page-new.php'] = 'edit.php?post_type=page'; +$_wp_real_parent_file['page-new.php'] = 'edit.php?post_type=page'; $_wp_real_parent_file['wpmu-admin.php'] = 'tools.php'; -$_wp_real_parent_file['ms-admin.php'] = 'tools.php'; +$_wp_real_parent_file['ms-admin.php'] = 'tools.php'; // Ensure backward compatibility. $compat = array( - 'index' => 'dashboard', - 'edit' => 'posts', - 'post' => 'posts', - 'upload' => 'media', - 'link-manager' => 'links', - 'edit-pages' => 'pages', - 'page' => 'pages', - 'edit-comments' => 'comments', + 'index' => 'dashboard', + 'edit' => 'posts', + 'post' => 'posts', + 'upload' => 'media', + 'link-manager' => 'links', + 'edit-pages' => 'pages', + 'page' => 'pages', + 'edit-comments' => 'comments', 'options-general' => 'settings', - 'themes' => 'appearance', - ); + 'themes' => 'appearance', +); -require_once(ABSPATH . 'wp-admin/includes/menu.php'); +require_once( ABSPATH . 'wp-admin/includes/menu.php' );