WordPress.org

Make WordPress Core

Ticket #23073: 23073.6.diff

File 23073.6.diff, 1.3 KB (added by markjaquith, 6 years ago)
  • wp-admin/network.php

     
    312312        $hostname          = get_clean_basedomain();
    313313        $slashed_home      = trailingslashit( get_option( 'home' ) );
    314314        $base              = parse_url( $slashed_home, PHP_URL_PATH );
    315         $wp_dir_from_root  = preg_replace( '#^' . preg_quote( $_SERVER['DOCUMENT_ROOT'], '#' ) . '#', '', ABSPATH );
    316         $wp_siteurl_subdir = trailingslashit( '/' . preg_replace( '#^' . preg_quote( $base, '#' ) . '#', '', $wp_dir_from_root ) );
     315        $document_root_fix = str_replace( '\\', '/', realpath( $_SERVER['DOCUMENT_ROOT'] ) );
     316        $abspath_fix       = str_replace( '\\', '/', ABSPATH );
     317        $home_path         = 0 === strpos( $abspath_fix, $document_root_fix ) ? $document_root_fix . $base : get_home_path();
     318        $wp_siteurl_subdir = preg_replace( '#^' . preg_quote( $home_path, '#' ) . '#', '', ABSPATH );
    317319        $rewrite_base      = ! empty( $wp_siteurl_subdir ) ? ltrim( trailingslashit( $wp_siteurl_subdir ), '/' ) : '';
    318320
    319         $home_path         = get_home_path();
    320 
    321321        $location_of_wp_config = ABSPATH;
    322322        if ( ! file_exists( ABSPATH . 'wp-config.php' ) && file_exists( dirname( ABSPATH ) . '/wp-config.php' ) )
    323323                $location_of_wp_config = trailingslashit( dirname( ABSPATH ) );