From 28248c1b08bbee003a7f9a1f932323943d51e888 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Tue, 12 Mar 2013 11:04:14 +0000 Subject: [PATCH] Make get_home_path() return consistent slashes. fixes #23175. git-svn-id: http://core.svn.wordpress.org/trunk@23669 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/file.php | 2 +- wp-admin/network.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php index eac8ab53a5..16b5cea7ea 100644 --- a/wp-admin/includes/file.php +++ b/wp-admin/includes/file.php @@ -90,7 +90,7 @@ function get_home_path() { $home_path = ABSPATH; } - return $home_path; + return str_replace( '\\', '/', $home_path ); } /** diff --git a/wp-admin/network.php b/wp-admin/network.php index 37181771d1..34ab5171cb 100644 --- a/wp-admin/network.php +++ b/wp-admin/network.php @@ -314,7 +314,7 @@ function network_step2( $errors = false ) { $base = parse_url( $slashed_home, PHP_URL_PATH ); $document_root_fix = str_replace( '\\', '/', realpath( $_SERVER['DOCUMENT_ROOT'] ) ); $abspath_fix = str_replace( '\\', '/', ABSPATH ); - $home_path = 0 === strpos( $abspath_fix, $document_root_fix ) ? $document_root_fix . $base : str_replace( '\\', '/', get_home_path() ); + $home_path = 0 === strpos( $abspath_fix, $document_root_fix ) ? $document_root_fix . $base : get_home_path(); $wp_siteurl_subdir = preg_replace( '#^' . preg_quote( $home_path, '#' ) . '#', '', $abspath_fix ); $rewrite_base = ! empty( $wp_siteurl_subdir ) ? ltrim( trailingslashit( $wp_siteurl_subdir ), '/' ) : '';