Ticket #17817: 17817.26.diff

src/wp-includes/plugin.php

@@ -21 +21 @@
  * @since 1.5.0
  */
 
-// Initialize the filter globals.
-require( ABSPATH . WPINC . '/class-wp-hook.php' );
-
 /** @var WP_Hook[] $wp_filter */
 global $wp_filter, $wp_actions, $wp_current_filter;
 

src/wp-settings.php

@@ -20 +20 @@
 // Include files required for initialization.
 require( ABSPATH . WPINC . '/load.php' );
 require( ABSPATH . WPINC . '/default-constants.php' );
+require_once( ABSPATH . WPINC . '/class-wp-hook.php' );
 require_once( ABSPATH . WPINC . '/plugin.php' );
 
 /*