From 64a713db2b67e29a5777a91ab1851e0135ecf7b3 Mon Sep 17 00:00:00 2001 From: audrasjb Date: Thu, 24 Nov 2022 22:11:14 +0000 Subject: [PATCH] Coding Standards: Remove extra slashes when concatenating `ABSPATH` with a path. Since `ABSPATH` is defined and documented to end with a forward slash `/`, this changeset removes the first `/` from strings appended to `ABSPATH` in various files, leading to `//` in the resulting path. Props TobiasBg, audrasjb, SergeyBiryukov, emanuelx. Fixes #57074. See #57071. Built from https://develop.svn.wordpress.org/trunk@54872 git-svn-id: http://core.svn.wordpress.org/trunk@54424 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-wp-site-health-auto-updates.php | 4 ++-- wp-admin/includes/class-wp-site-health.php | 2 +- wp-admin/includes/file.php | 2 +- wp-includes/version.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wp-admin/includes/class-wp-site-health-auto-updates.php b/wp-admin/includes/class-wp-site-health-auto-updates.php index f6fb7d79b9..e3c02d0620 100644 --- a/wp-admin/includes/class-wp-site-health-auto-updates.php +++ b/wp-admin/includes/class-wp-site-health-auto-updates.php @@ -277,7 +277,7 @@ class WP_Site_Health_Auto_Updates { public function test_check_wp_filesystem_method() { // Make sure the `request_filesystem_credentials()` function is available during our REST API call. if ( ! function_exists( 'request_filesystem_credentials' ) ) { - require_once ABSPATH . '/wp-admin/includes/file.php'; + require_once ABSPATH . 'wp-admin/includes/file.php'; } $skin = new Automatic_Upgrader_Skin; @@ -328,7 +328,7 @@ class WP_Site_Health_Auto_Updates { // Make sure the `get_core_checksums()` function is available during our REST API call. if ( ! function_exists( 'get_core_checksums' ) ) { - require_once ABSPATH . '/wp-admin/includes/update.php'; + require_once ABSPATH . 'wp-admin/includes/update.php'; } $checksums = get_core_checksums( $wp_version, 'en_US' ); diff --git a/wp-admin/includes/class-wp-site-health.php b/wp-admin/includes/class-wp-site-health.php index abe0fc6184..4300abd8de 100644 --- a/wp-admin/includes/class-wp-site-health.php +++ b/wp-admin/includes/class-wp-site-health.php @@ -65,7 +65,7 @@ class WP_Site_Health { */ public function show_site_health_tab( $tab ) { if ( 'debug' === $tab ) { - require_once ABSPATH . '/wp-admin/site-health-info.php'; + require_once ABSPATH . 'wp-admin/site-health-info.php'; } } diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php index bfd32ec899..a89e601060 100644 --- a/wp-admin/includes/file.php +++ b/wp-admin/includes/file.php @@ -2442,7 +2442,7 @@ function request_filesystem_credentials( $form_post, $type = '', $error = false, // Make sure the `submit_button()` function is available during the REST API call // from WP_Site_Health_Auto_Updates::test_check_wp_filesystem_method(). if ( ! function_exists( 'submit_button' ) ) { - require_once ABSPATH . '/wp-admin/includes/template.php'; + require_once ABSPATH . 'wp-admin/includes/template.php'; } ?>

diff --git a/wp-includes/version.php b/wp-includes/version.php index 4fadc27eb4..736756f304 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.2-alpha-54871'; +$wp_version = '6.2-alpha-54872'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.