Changeset 23295

Timestamp:

01/10/2013 08:08:14 AM (12 years ago)

Author:

markjaquith

Message:

Resolve DOCUMENT_ROOT symlinks and standardize Windows slashing for various paths related to Multisite rewrite rule generation. props SergeyBiryukov, nacin, wpewill. fixes #23104 and #23073 for trunk

File:

• trunk/wp-admin/network.php (modified) (1 diff)

trunk/wp-admin/network.php

@@ -313 +313 @@
     $slashed_home      = trailingslashit( get_option( 'home' ) );
     $base              = parse_url( $slashed_home, PHP_URL_PATH );
-    $wp_dir_from_root  = preg_replace( '#^' . preg_quote( $_SERVER['DOCUMENT_ROOT'], '#' ) . '#', '', ABSPATH );
-    $wp_siteurl_subdir = trailingslashit( '/' . preg_replace( '#^' . preg_quote( $base, '#' ) . '#', '', $wp_dir_from_root ) );
+    $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() );
+    $wp_siteurl_subdir = preg_replace( '#^' . preg_quote( $home_path, '#' ) . '#', '', $abspath_fix );
     $rewrite_base      = ! empty( $wp_siteurl_subdir ) ? ltrim( trailingslashit( $wp_siteurl_subdir ), '/' ) : '';
 
-    $home_path         = get_home_path();
 
     $location_of_wp_config = ABSPATH;