Changeset 53266

Timestamp:

04/26/2022 06:30:24 AM (2 years ago)

Author:

audrasjb

Message:

Bootstrap/load: Move administration related hooks to admin-filters.php.

This change moves some administration related hooks from default-filters.php to admin-filters.php. It also updates the default-filters.php docblock to indicate that contextualized hooks should be located in the most appropriate place.

Props dlh, hellofromTonya, antonvlasenko, audrasjb, azaozz.
Fixes #54795.

Location:

trunk/src

Files:

• wp-admin/includes/admin-filters.php (modified) (3 diffs)
• wp-includes/default-filters.php (modified) (5 diffs)

trunk/src/wp-admin/includes/admin-filters.php

@@ -13 +13 @@
 // Dashboard hooks.
 add_action( 'activity_box_end', 'wp_dashboard_quota' );
+add_action( 'welcome_panel', 'wp_welcome_panel' );
 
 // Media hooks.
@@ -37 +38 @@
 add_filter( 'media_upload_tabs', 'update_gallery_tab' );
 
+// Admin color schemes.
+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_head', 'wp_admin_canonical_url' );
-add_action( 'admin_head', 'wp_color_scheme_settings' );
 add_action( 'admin_head', 'wp_site_icon' );
 add_action( 'admin_head', 'wp_admin_viewport_meta' );
 add_action( 'customize_controls_head', 'wp_admin_viewport_meta' );
+add_filter( 'nav_menu_meta_box_object', '_wp_nav_menu_meta_box_object' );
 
 // Prerendering.
@@ -70 +75 @@
 
 add_filter( 'heartbeat_settings', 'wp_heartbeat_set_suspension' );
+
+add_action( 'use_block_editor_for_post_type', '_disable_block_editor_for_navigation_post_type', 10, 2 );
+add_action( 'edit_form_after_title', '_disable_content_editor_for_navigation_post_type' );
+add_action( 'edit_form_after_editor', '_enable_content_editor_for_navigation_post_type' );
 
 // Nav Menu hooks.

trunk/src/wp-includes/default-filters.php

@@ -8 +8 @@
  * hook.
  *
- * Not all of the default hooks are found in default-filters.php
+ * Not all of the default hooks are found in this file.
+ * 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
+ * (admin area, multisite environment…), please move it
+ * to a more appropriate file instead.
  *
  * @package WordPress
@@ -294 +300 @@
 add_filter( 'editable_slug', 'urldecode' );
 add_filter( 'editable_slug', 'esc_textarea' );
-add_filter( 'nav_menu_meta_box_object', '_wp_nav_menu_meta_box_object' );
 add_filter( 'pingback_ping_source_uri', 'pingback_ping_source_uri' );
 add_filter( 'xmlrpc_pingback_error', 'xmlrpc_pingback_error' );
@@ -414 +419 @@
 add_action( 'comment_form', 'wp_comment_form_unfiltered_html_nonce' );
 add_action( 'admin_init', 'send_frame_options_header', 10, 0 );
-add_action( 'welcome_panel', 'wp_welcome_panel' );
 
 // Privacy.
@@ -463 +467 @@
 // Admin color schemes.
 add_action( 'admin_init', 'register_admin_color_schemes', 1 );
-add_action( 'admin_color_scheme_picker', 'admin_color_scheme_picker' );
 
 // If the upgrade hasn't run yet, assume link manager is used.
@@ -592 +595 @@
 add_action( 'wp_footer', 'wp_maybe_inline_styles', 1 ); // Run for late-loaded styles in the footer.
 
-add_action( 'use_block_editor_for_post_type', '_disable_block_editor_for_navigation_post_type', 10, 2 );
-add_action( 'edit_form_after_title', '_disable_content_editor_for_navigation_post_type' );
-add_action( 'edit_form_after_editor', '_enable_content_editor_for_navigation_post_type' );
-
 /*
  * Disable "Post Attributes" for wp_navigation post type. The attributes are