Skip to content

Commit 0720297

Browse files
committed
Code Quality: Restore trunk hooks removed during rebase
Fix stale changes in default-filters.php that were carried over from the old branch during the rewrite. Restores the Connectors API init hook, login_head resource hints action, wp_default_styles hook for classic theme block styles, and admin_init hook for collaboration setting injection.
1 parent e9f492b commit 0720297

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

src/wp-includes/default-filters.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@
385385

386386
// Login actions.
387387
add_action( 'login_head', 'wp_robots', 1 );
388-
add_filter( 'login_head', 'wp_resource_hints', 8 );
388+
add_action( 'login_head', 'wp_resource_hints', 8 );
389389
add_action( 'login_head', 'wp_print_head_scripts', 9 );
390390
add_action( 'login_head', 'print_admin_styles', 9 );
391391
add_action( 'login_head', 'wp_site_icon', 99 );
@@ -540,6 +540,9 @@
540540
add_action( 'wp_abilities_api_categories_init', 'wp_register_core_ability_categories' );
541541
add_action( 'wp_abilities_api_init', 'wp_register_core_abilities' );
542542

543+
// Connectors API.
544+
add_action( 'init', '_wp_connectors_init', 15 );
545+
543546
// Sitemaps actions.
544547
add_action( 'init', 'wp_sitemaps_get_server' );
545548

@@ -605,7 +608,7 @@
605608
add_action( 'enqueue_block_assets', 'wp_enqueue_classic_theme_styles' );
606609
add_action( 'enqueue_block_assets', 'wp_enqueue_registered_block_scripts_and_styles' );
607610
add_action( 'enqueue_block_assets', 'enqueue_block_styles_assets', 30 );
608-
add_action( 'init', 'wp_load_classic_theme_block_styles_on_demand', 8 ); // Must happen before register_core_block_style_handles() at priority 9.
611+
add_action( 'wp_default_styles', 'wp_load_classic_theme_block_styles_on_demand', 0 ); // Must happen before wp_default_styles() and register_core_block_style_handles().
609612
/*
610613
* `wp_enqueue_registered_block_scripts_and_styles` is bound to both
611614
* `enqueue_block_editor_assets` and `enqueue_block_assets` hooks
@@ -797,7 +800,7 @@
797800
add_action( 'init', '_wp_register_default_font_collections' );
798801

799802
// Collaboration.
800-
add_action( 'enqueue_block_editor_assets', 'wp_collaboration_inject_setting' );
803+
add_action( 'admin_init', 'wp_collaboration_inject_setting' );
801804

802805
// Add ignoredHookedBlocks metadata attribute to the template and template part post types.
803806
add_filter( 'rest_pre_insert_wp_template', 'inject_ignored_hooked_blocks_metadata_attributes' );

0 commit comments

Comments
 (0)