vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2025-10-16 12:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Coding Standards: Remove extra slashes when concatenating ABSPATH with a path.

Browse Source 
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.


git-svn-id: https://develop.svn.wordpress.org/trunk@54872 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Jb Audras 2022-11-24 22:09:39 +00:00
parent bb948c5f6d
commit d19f5f0170
12 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wp-admin/includes/class-wp-site-health-auto-updates.php
View File

@ -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' );

2
src/wp-admin/includes/class-wp-site-health.php
View File

@ -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';
}
}

2
src/wp-admin/includes/file.php
View File

@ -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';
}
?>
<p class="request-filesystem-credentials-action-buttons">

2
tests/phpunit/includes/bootstrap.php
View File

@ -302,7 +302,7 @@ if ( isset( $GLOBALS['wp_tests_options'] ) ) {
}
// Load WordPress.
require_once ABSPATH . '/wp-settings.php';
require_once ABSPATH . 'wp-settings.php';
// Delete any default posts & related data.
_delete_all_posts();

6
tests/phpunit/includes/install.php
View File

@ -37,10 +37,10 @@ $_SERVER['PHP_SELF'] = '/index.php';
tests_add_filter( 'wp_die_handler', '_wp_die_handler_filter_exit' );
require_once ABSPATH . '/wp-settings.php';
require_once ABSPATH . 'wp-settings.php';
require_once ABSPATH . '/wp-admin/includes/upgrade.php';
require_once ABSPATH . '/wp-includes/class-wpdb.php';
require_once ABSPATH . 'wp-admin/includes/upgrade.php';
require_once ABSPATH . 'wp-includes/class-wpdb.php';
// Override the PHPMailer.
global $phpmailer;

2
tests/phpunit/tests/customize/widgets.php
View File

@ -556,7 +556,7 @@ class Tests_WP_Customize_Widgets extends WP_UnitTestCase {
*/
private function get_test_widget_control_args() {
global $wp_registered_widgets;
require_once ABSPATH . '/wp-admin/includes/widgets.php';
require_once ABSPATH . 'wp-admin/includes/widgets.php';
$widget_id = 'search-2';
$widget = $wp_registered_widgets[ $widget_id ];
$args = array(

4
tests/phpunit/tests/feed/wpSimplePieFile.php
View File

@ -19,8 +19,8 @@ class Tests_Feed_wpSimplePieFile extends WP_UnitTestCase {
public static function set_up_before_class() {
parent::set_up_before_class();
require_once ABSPATH . '/wp-includes/class-simplepie.php';
require_once ABSPATH . '/wp-includes/class-wp-simplepie-file.php';
require_once ABSPATH . 'wp-includes/class-simplepie.php';
require_once ABSPATH . 'wp-includes/class-wp-simplepie-file.php';
}
/**

4
tests/phpunit/tests/pluggable/signatures.php
View File

@ -76,7 +76,7 @@ class Tests_Pluggable_Signatures extends WP_UnitTestCase {
*/
public function get_defined_pluggable_functions() {
require_once ABSPATH . '/wp-admin/includes/upgrade.php';
require_once ABSPATH . 'wp-admin/includes/upgrade.php';
$test_functions = array(
'install_network',
@ -103,7 +103,7 @@ class Tests_Pluggable_Signatures extends WP_UnitTestCase {
}
foreach ( $test_files as $file ) {
preg_match_all( '#^\t?function (\w+)#m', file_get_contents( ABSPATH . '/' . $file ), $functions );
preg_match_all( '#^\t?function (\w+)#m', file_get_contents( ABSPATH . $file ), $functions );
foreach ( $functions[1] as $function ) {
$data[] = array(

2
tests/phpunit/tests/pluggable/wpMail.php
View File

@ -173,7 +173,7 @@ class Tests_Pluggable_wpMail extends WP_UnitTestCase {
$this->assertTrue( wp_mail( 'valid@address.com', 'subject', 'body' ) );
// Non-fatal errors.
$this->assertTrue( wp_mail( 'valid@address.com', 'subject', 'body', "Cc: invalid-address\nBcc: @invalid.address", ABSPATH . '/non-existent-file.html' ) );
$this->assertTrue( wp_mail( 'valid@address.com', 'subject', 'body', "Cc: invalid-address\nBcc: @invalid.address", ABSPATH . 'non-existent-file.html' ) );
// Fatal errors.
$this->assertFalse( wp_mail( 'invalid.address', 'subject', 'body', '', array() ) );

2
tests/phpunit/tests/pomo/po.php
View File

@ -48,7 +48,7 @@ http://wordpress.org/
public static function set_up_before_class() {
parent::set_up_before_class();
require_once ABSPATH . '/wp-includes/pomo/po.php';
require_once ABSPATH . 'wp-includes/pomo/po.php';
}
public function test_prepend_each_line() {

2
tests/phpunit/tests/post.php
View File

@ -285,7 +285,7 @@ class Tests_Post extends WP_UnitTestCase {
$this->markTestSkipped( 'This test is only useful with the utf8 character set.' );
}
require_once ABSPATH . '/wp-admin/includes/post.php';
require_once ABSPATH . 'wp-admin/includes/post.php';
$post_id = self::factory()->post->create();

2
tests/phpunit/tests/widgets.php
View File

@ -813,7 +813,7 @@ class Tests_Widgets extends WP_UnitTestCase {
);
wp_widgets_init();
require_once ABSPATH . '/wp-admin/includes/widgets.php';
require_once ABSPATH . 'wp-admin/includes/widgets.php';
$widget_id = 'search-2';
$widget = $wp_registered_widgets[ $widget_id ];
$params = array(