From f7da44c8d22022233252c8f9fe08ce924ed7ad2a Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sun, 31 May 2020 19:54:24 +0000 Subject: [PATCH] Upgrade/Install: Rename `wp_in_maintenance_mode()` to `wp_is_maintenance_mode()`, for consistency with `wp_is_recovery_mode()`. While the former name might be a bit more accurate, the latter matches the existing naming pattern. Follow-up to [47623]. Fixes #49959. Built from https://develop.svn.wordpress.org/trunk@47871 git-svn-id: http://core.svn.wordpress.org/trunk@47646 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-wp-fatal-error-handler.php | 2 +- wp-includes/load.php | 4 ++-- wp-includes/version.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wp-includes/class-wp-fatal-error-handler.php b/wp-includes/class-wp-fatal-error-handler.php index a461281bec..fce925a456 100644 --- a/wp-includes/class-wp-fatal-error-handler.php +++ b/wp-includes/class-wp-fatal-error-handler.php @@ -31,7 +31,7 @@ class WP_Fatal_Error_Handler { } // Do not trigger the fatal error handler while updates are being installed. - if ( wp_in_maintenance_mode() ) { + if ( wp_is_maintenance_mode() ) { return; } diff --git a/wp-includes/load.php b/wp-includes/load.php index 51fe392a20..70b2188c4b 100644 --- a/wp-includes/load.php +++ b/wp-includes/load.php @@ -154,7 +154,7 @@ function wp_favicon_request() { */ function wp_maintenance() { // Return if maintenance mode is disabled. - if ( ! wp_in_maintenance_mode() ) { + if ( ! wp_is_maintenance_mode() ) { return; } @@ -189,7 +189,7 @@ function wp_maintenance() { * * @return bool True if maintenance mode is enabled, false otherwise. */ -function wp_in_maintenance_mode() { +function wp_is_maintenance_mode() { global $upgrading; if ( ! file_exists( ABSPATH . '.maintenance' ) || wp_installing() ) { diff --git a/wp-includes/version.php b/wp-includes/version.php index 87f2ba6fc7..6ad3ea9cba 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.5-alpha-47870'; +$wp_version = '5.5-alpha-47871'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.