From 53b38b0516ed7129f5a823c6dd1d8a1ab017993a Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Mon, 17 Mar 2025 22:40:26 +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. Follow-up to [54872], [55720], [57545]. Props dhruvik18, SergeyBiryukov. Fixes #63102. Built from https://develop.svn.wordpress.org/trunk@60034 git-svn-id: http://core.svn.wordpress.org/trunk@59370 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-wp-site-health.php | 2 +- wp-includes/class-wp-plugin-dependencies.php | 8 ++++---- wp-includes/update.php | 2 +- wp-includes/version.php | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/wp-admin/includes/class-wp-site-health.php b/wp-admin/includes/class-wp-site-health.php index 19d109d447..afcbfcb6f9 100644 --- a/wp-admin/includes/class-wp-site-health.php +++ b/wp-admin/includes/class-wp-site-health.php @@ -1886,7 +1886,7 @@ class WP_Site_Health { ); if ( ! function_exists( 'WP_Filesystem' ) ) { - require_once ABSPATH . '/wp-admin/includes/file.php'; + require_once ABSPATH . 'wp-admin/includes/file.php'; } ob_start(); diff --git a/wp-includes/class-wp-plugin-dependencies.php b/wp-includes/class-wp-plugin-dependencies.php index 0850ffd2a2..e4dc4b0f40 100644 --- a/wp-includes/class-wp-plugin-dependencies.php +++ b/wp-includes/class-wp-plugin-dependencies.php @@ -159,7 +159,7 @@ class WP_Plugin_Dependencies { * @return bool Whether the plugin has active dependents. */ public static function has_active_dependents( $plugin_file ) { - require_once ABSPATH . '/wp-admin/includes/plugin.php'; + require_once ABSPATH . 'wp-admin/includes/plugin.php'; $dependents = self::get_dependents( self::convert_to_slug( $plugin_file ) ); foreach ( $dependents as $dependent ) { @@ -235,7 +235,7 @@ class WP_Plugin_Dependencies { return false; } - require_once ABSPATH . '/wp-admin/includes/plugin.php'; + require_once ABSPATH . 'wp-admin/includes/plugin.php'; foreach ( self::$dependencies[ $plugin_file ] as $dependency ) { $dependency_filepath = self::get_dependency_filepath( $dependency ); @@ -495,7 +495,7 @@ class WP_Plugin_Dependencies { wp_send_json_success( $status ); } - require_once ABSPATH . '/wp-admin/includes/plugin.php'; + require_once ABSPATH . 'wp-admin/includes/plugin.php'; $inactive_dependencies = array(); foreach ( $dependencies as $dependency ) { @@ -544,7 +544,7 @@ class WP_Plugin_Dependencies { return self::$plugins; } - require_once ABSPATH . '/wp-admin/includes/plugin.php'; + require_once ABSPATH . 'wp-admin/includes/plugin.php'; self::$plugins = get_plugins(); return self::$plugins; diff --git a/wp-includes/update.php b/wp-includes/update.php index 3e838e98fe..cac5aecab6 100644 --- a/wp-includes/update.php +++ b/wp-includes/update.php @@ -1121,7 +1121,7 @@ function _wp_delete_all_temp_backups() { global $wp_filesystem; if ( ! function_exists( 'WP_Filesystem' ) ) { - require_once ABSPATH . '/wp-admin/includes/file.php'; + require_once ABSPATH . 'wp-admin/includes/file.php'; } ob_start(); diff --git a/wp-includes/version.php b/wp-includes/version.php index fff5b448c7..7555a81cb2 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.8-beta2-60033'; +$wp_version = '6.8-beta2-60034'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.