Bootstrap/Load: Remove duplicate leading slashes on inclusion of various files under ABSPATH.

SergeyBiryukov · SergeyBiryukov · commit 30caafae4081 · 2019-04-13T04:45:05.000Z
Props dmsnell, birgire, szepe.viktor. Fixes #46327. git-svn-id: https://develop.svn.wordpress.org/trunk@45190 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/src/index.php b/src/index.php
@@ -12,7 +12,7 @@
 }
 
 if ( file_exists( ABSPATH . 'wp-includes/js/dist/edit-post.js' ) ) {
-	require_once ABSPATH . '/_index.php';
+	require_once ABSPATH . '_index.php';
 	return;
 }
 
diff --git a/src/wp-admin/includes/ajax-actions.php b/src/wp-admin/includes/ajax-actions.php
@@ -3620,7 +3620,7 @@ function wp_ajax_crop_image() {
 
 	switch ( $context ) {
 		case 'site-icon':
-			require_once ABSPATH . '/wp-admin/includes/class-wp-site-icon.php';
+			require_once ABSPATH . 'wp-admin/includes/class-wp-site-icon.php';
 			$wp_site_icon = new WP_Site_Icon();
 
 			// Skip creating a new attachment if the attachment is a Site Icon.
diff --git a/src/wp-admin/includes/class-wp-debug-data.php b/src/wp-admin/includes/class-wp-debug-data.php
@@ -666,9 +666,9 @@ static function debug_data() {
 		);
 
 		// Check if a .htaccess file exists.
-		if ( is_file( ABSPATH . '/.htaccess' ) ) {
+		if ( is_file( ABSPATH . '.htaccess' ) ) {
 			// If the file exists, grab the content of it.
-			$htaccess_content = file_get_contents( ABSPATH . '/.htaccess' );
+			$htaccess_content = file_get_contents( ABSPATH . '.htaccess' );
 
 			// Filter away the core WordPress rules.
 			$filtered_htaccess_content = trim( preg_replace( '/\# BEGIN WordPress[\s\S]+?# END WordPress/si', '', $htaccess_content ) );
diff --git a/src/wp-admin/includes/class-wp-site-health-auto-updates.php b/src/wp-admin/includes/class-wp-site-health-auto-updates.php
@@ -350,10 +350,10 @@ function test_all_files_writable() {
 			if ( 'wp-content' == substr( $file, 0, 10 ) ) {
 				continue;
 			}
-			if ( ! file_exists( ABSPATH . '/' . $file ) ) {
+			if ( ! file_exists( ABSPATH . $file ) ) {
 				continue;
 			}
-			if ( ! is_writable( ABSPATH . '/' . $file ) ) {
+			if ( ! is_writable( ABSPATH . $file ) ) {
 				$unwritable_files[] = $file;
 			}
 		}
diff --git a/src/wp-includes/class-wp-customize-manager.php b/src/wp-includes/class-wp-customize-manager.php
@@ -402,7 +402,7 @@ public function __construct( $args = array() ) {
 
 		// Add theme update notices.
 		if ( current_user_can( 'install_themes' ) || current_user_can( 'update_themes' ) ) {
-			require_once ABSPATH . '/wp-admin/includes/update.php';
+			require_once ABSPATH . 'wp-admin/includes/update.php';
 			add_action( 'customize_controls_print_footer_scripts', 'wp_print_admin_notice_templates' );
 		}
 	}
diff --git a/src/wp-includes/class-wp-customize-widgets.php b/src/wp-includes/class-wp-customize-widgets.php
@@ -949,7 +949,7 @@ public function get_available_widgets() {
 		}
 
 		global $wp_registered_widgets, $wp_registered_widget_controls;
-		require_once ABSPATH . '/wp-admin/includes/widgets.php'; // for next_widget_id_number()
+		require_once ABSPATH . 'wp-admin/includes/widgets.php'; // for next_widget_id_number()
 
 		$sort = $wp_registered_widgets;
 		usort( $sort, array( $this, '_sort_name_callback' ) );
diff --git a/src/wp-includes/customize/class-wp-widget-form-customize-control.php b/src/wp-includes/customize/class-wp-widget-form-customize-control.php
@@ -96,7 +96,7 @@ public function to_json() {
 		}
 
 		// Get the widget_control and widget_content.
-		require_once ABSPATH . '/wp-admin/includes/widgets.php';
+		require_once ABSPATH . 'wp-admin/includes/widgets.php';
 
 		$widget = $wp_registered_widgets[ $this->widget_id ];
 		if ( ! isset( $widget['params'][0] ) ) {
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php
@@ -1614,7 +1614,7 @@ public function prepare_item_for_response( $post, $request ) {
 		if ( is_post_type_viewable( $post_type_obj ) && $post_type_obj->public ) {
 
 			if ( ! function_exists( 'get_sample_permalink' ) ) {
-				require_once ABSPATH . '/wp-admin/includes/post.php';
+				require_once ABSPATH . 'wp-admin/includes/post.php';
 			}
 
 			$sample_permalink = get_sample_permalink( $post->ID, $post->post_title, '' );
diff --git a/src/wp-includes/update.php b/src/wp-includes/update.php
@@ -595,8 +595,8 @@ function wp_update_themes( $extra_stats = array() ) {
  * @since 3.7.0
  */
 function wp_maybe_auto_update() {
-	include_once( ABSPATH . '/wp-admin/includes/admin.php' );
-	include_once( ABSPATH . '/wp-admin/includes/class-wp-upgrader.php' );
+	include_once( ABSPATH . 'wp-admin/includes/admin.php' );
+	include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
 
 	$upgrader = new WP_Automatic_Updater;
 	$upgrader->run();

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`if ( file_exists( ABSPATH . 'wp-includes/js/dist/edit-post.js' ) ) {`
`15`		`- require_once ABSPATH . '/_index.php';`
	`15`	`+ require_once ABSPATH . '_index.php';`
`16`	`16`	`return;`
`17`	`17`	`}`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -350,10 +350,10 @@ function test_all_files_writable() {`
`350`	`350`	`if ( 'wp-content' == substr( $file, 0, 10 ) ) {`
`351`	`351`	`continue;`
`352`	`352`	`}`
`353`		`- if ( ! file_exists( ABSPATH . '/' . $file ) ) {`
	`353`	`+ if ( ! file_exists( ABSPATH . $file ) ) {`
`354`	`354`	`continue;`
`355`	`355`	`}`
`356`		`- if ( ! is_writable( ABSPATH . '/' . $file ) ) {`
	`356`	`+ if ( ! is_writable( ABSPATH . $file ) ) {`
`357`	`357`	`$unwritable_files[] = $file;`
`358`	`358`	`}`
`359`	`359`	`}`
Original file line number	Diff line number	Diff line change
`@@ -402,7 +402,7 @@ public function __construct( $args = array() ) {`
`402`	`402`
`403`	`403`	`// Add theme update notices.`
`404`	`404`	`if ( current_user_can( 'install_themes' ) \|\| current_user_can( 'update_themes' ) ) {`
`405`		`- require_once ABSPATH . '/wp-admin/includes/update.php';`
	`405`	`+ require_once ABSPATH . 'wp-admin/includes/update.php';`
`406`	`406`	`add_action( 'customize_controls_print_footer_scripts', 'wp_print_admin_notice_templates' );`
`407`	`407`	`}`
`408`	`408`	`}`
Original file line number	Diff line number	Diff line change
`@@ -949,7 +949,7 @@ public function get_available_widgets() {`
`949`	`949`	`}`
`950`	`950`
`951`	`951`	`global $wp_registered_widgets, $wp_registered_widget_controls;`
`952`		`- require_once ABSPATH . '/wp-admin/includes/widgets.php'; // for next_widget_id_number()`
	`952`	`+ require_once ABSPATH . 'wp-admin/includes/widgets.php'; // for next_widget_id_number()`
`953`	`953`
`954`	`954`	`$sort = $wp_registered_widgets;`
`955`	`955`	`usort( $sort, array( $this, '_sort_name_callback' ) );`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public function to_json() {`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`// Get the widget_control and widget_content.`
`99`		`- require_once ABSPATH . '/wp-admin/includes/widgets.php';`
	`99`	`+ require_once ABSPATH . 'wp-admin/includes/widgets.php';`
`100`	`100`
`101`	`101`	`$widget = $wp_registered_widgets[ $this->widget_id ];`
`102`	`102`	`if ( ! isset( $widget['params'][0] ) ) {`
Original file line number	Diff line number	Diff line change
`@@ -1614,7 +1614,7 @@ public function prepare_item_for_response( $post, $request ) {`
`1614`	`1614`	`if ( is_post_type_viewable( $post_type_obj ) && $post_type_obj->public ) {`
`1615`	`1615`
`1616`	`1616`	`if ( ! function_exists( 'get_sample_permalink' ) ) {`
`1617`		`- require_once ABSPATH . '/wp-admin/includes/post.php';`
	`1617`	`+ require_once ABSPATH . 'wp-admin/includes/post.php';`
`1618`	`1618`	`}`
`1619`	`1619`
`1620`	`1620`	`$sample_permalink = get_sample_permalink( $post->ID, $post->post_title, '' );`