From 4e4e8fa110212083d2d831db0ce511a9ffd9f51f Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Thu, 28 Mar 2019 19:04:51 +0000 Subject: [PATCH] Bootstrap/Load: Ensure the fatal error handler is registered after `WP_CONTENT_DIR` is defined, so the custom error handler drop-in could be properly loaded. Props sebastian.pisula, diddledan. Fixes #46069. Built from https://develop.svn.wordpress.org/trunk@45056 git-svn-id: http://core.svn.wordpress.org/trunk@44865 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/version.php | 2 +- wp-settings.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wp-includes/version.php b/wp-includes/version.php index 407e84e64e..2d56f0b5a9 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.2-beta1-45055'; +$wp_version = '5.2-beta1-45056'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/wp-settings.php b/wp-settings.php index 7b666e2851..518db55963 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -28,9 +28,6 @@ require( ABSPATH . WPINC . '/error-protection.php' ); require( ABSPATH . WPINC . '/default-constants.php' ); require_once( ABSPATH . WPINC . '/plugin.php' ); -// Make sure we register the shutdown handler for fatal errors as soon as possible. -wp_register_fatal_error_handler(); - /* * These can't be directly globalized in version.php. When updating, * we're including version.php from another installation and don't want @@ -51,6 +48,9 @@ global $blog_id; // Set initial default constants including WP_MEMORY_LIMIT, WP_MAX_MEMORY_LIMIT, WP_DEBUG, SCRIPT_DEBUG, WP_CONTENT_DIR and WP_CACHE. wp_initial_constants(); +// Make sure we register the shutdown handler for fatal errors as soon as possible. +wp_register_fatal_error_handler(); + // Check for the required PHP version and for the MySQL extension or a database drop-in. wp_check_php_mysql_versions();