From 2334cea3e9120980c10c9cc455a98ea5d634aa28 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Thu, 28 Apr 2022 16:39:11 +0000 Subject: [PATCH] Bootstrap/Load: Move some more administration-related hooks to `admin-filters.php`. Follow-up to [53266]. Fixes #54795. Built from https://develop.svn.wordpress.org/trunk@53304 git-svn-id: http://core.svn.wordpress.org/trunk@52893 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/admin-filters.php | 9 +++++++++ wp-includes/default-filters.php | 15 ++------------- wp-includes/version.php | 2 +- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/wp-admin/includes/admin-filters.php b/wp-admin/includes/admin-filters.php index 953877010a..e80c111dde 100644 --- a/wp-admin/includes/admin-filters.php +++ b/wp-admin/includes/admin-filters.php @@ -38,12 +38,14 @@ add_filter( 'media_upload_library', 'media_upload_library' ); add_filter( 'media_upload_tabs', 'update_gallery_tab' ); // Admin color schemes. +add_action( 'admin_init', 'register_admin_color_schemes', 1 ); add_action( 'admin_head', 'wp_color_scheme_settings' ); add_action( 'admin_color_scheme_picker', 'admin_color_scheme_picker' ); // Misc hooks. add_action( 'admin_init', 'wp_admin_headers' ); add_action( 'login_init', 'wp_admin_headers' ); +add_action( 'admin_init', 'send_frame_options_header', 10, 0 ); add_action( 'admin_head', 'wp_admin_canonical_url' ); add_action( 'admin_head', 'wp_site_icon' ); add_action( 'admin_head', 'wp_admin_viewport_meta' ); @@ -55,6 +57,13 @@ if ( ! is_customize_preview() ) { add_filter( 'admin_print_styles', 'wp_resource_hints', 1 ); } +add_action( 'admin_print_scripts', 'print_emoji_detection_script' ); +add_action( 'admin_print_scripts', 'print_head_scripts', 20 ); +add_action( 'admin_print_footer_scripts', '_wp_footer_scripts' ); +add_action( 'admin_print_styles', 'print_emoji_styles' ); +add_action( 'admin_print_styles', 'print_admin_styles', 20 ); + +add_action( 'admin_print_scripts-index.php', 'wp_localize_community_events' ); add_action( 'admin_print_scripts-post.php', 'wp_page_reload_on_back_button_js' ); add_action( 'admin_print_scripts-post-new.php', 'wp_page_reload_on_back_button_js' ); diff --git a/wp-includes/default-filters.php b/wp-includes/default-filters.php index ed12faf1ec..391796517c 100644 --- a/wp-includes/default-filters.php +++ b/wp-includes/default-filters.php @@ -4,11 +4,10 @@ * of the WordPress hooks. * * If you need to remove a default hook, this file will - * give you the priority for which to use to remove the - * hook. + * give you the priority to use for removing the hook. * * Not all of the default hooks are found in this file. - * For instance, administration related hooks are located in + * For instance, administration-related hooks are located in * wp-admin/includes/admin-filters.php. * * If a hook should only be called from a specific context @@ -403,11 +402,6 @@ add_action( 'do_robots', 'do_robots' ); add_action( 'do_favicon', 'do_favicon' ); add_action( 'set_comment_cookies', 'wp_set_comment_cookies', 10, 3 ); add_action( 'sanitize_comment_cookies', 'sanitize_comment_cookies' ); -add_action( 'admin_print_scripts', 'print_emoji_detection_script' ); -add_action( 'admin_print_scripts', 'print_head_scripts', 20 ); -add_action( 'admin_print_footer_scripts', '_wp_footer_scripts' ); -add_action( 'admin_print_styles', 'print_emoji_styles' ); -add_action( 'admin_print_styles', 'print_admin_styles', 20 ); add_action( 'init', 'smilies_init', 5 ); add_action( 'plugins_loaded', 'wp_maybe_load_widgets', 0 ); add_action( 'plugins_loaded', 'wp_maybe_load_embeds', 0 ); @@ -418,7 +412,6 @@ add_action( 'publish_post', '_publish_post_hook', 5, 1 ); add_action( 'transition_post_status', '_transition_post_status', 5, 3 ); add_action( 'transition_post_status', '_update_term_count_on_transition_post_status', 10, 3 ); add_action( 'comment_form', 'wp_comment_form_unfiltered_html_nonce' ); -add_action( 'admin_init', 'send_frame_options_header', 10, 0 ); // Privacy. add_action( 'user_request_action_confirmed', '_wp_privacy_account_request_confirmed' ); @@ -465,9 +458,6 @@ add_action( 'wp_head', 'wp_post_preview_js', 1 ); // Timezone. add_filter( 'pre_option_gmt_offset', 'wp_timezone_override_offset' ); -// Admin color schemes. -add_action( 'admin_init', 'register_admin_color_schemes', 1 ); - // If the upgrade hasn't run yet, assume link manager is used. add_filter( 'default_option_link_manager_enabled', '__return_true' ); @@ -575,7 +565,6 @@ add_action( 'enqueue_block_editor_assets', 'enqueue_editor_block_styles_assets' add_action( 'enqueue_block_editor_assets', 'wp_enqueue_editor_block_directory_assets' ); add_action( 'enqueue_block_editor_assets', 'wp_enqueue_editor_format_library_assets' ); add_action( 'enqueue_block_editor_assets', 'wp_enqueue_global_styles_css_custom_properties' ); -add_action( 'admin_print_scripts-index.php', 'wp_localize_community_events' ); add_filter( 'wp_print_scripts', 'wp_just_in_time_script_localization' ); add_filter( 'print_scripts_array', 'wp_prototype_before_jquery' ); add_filter( 'customize_controls_print_styles', 'wp_resource_hints', 1 ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 16ce207640..eeb950c1b3 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.0-beta3-53303'; +$wp_version = '6.0-beta3-53304'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.