Ticket #23073: 23073.2.diff
File 23073.2.diff, 1.2 KB (added by , 12 years ago) |
---|
-
wp-admin/network.php
309 309 function network_step2( $errors = false ) { 310 310 global $wpdb; 311 311 312 $home_path = get_home_path(); 312 313 $hostname = get_clean_basedomain(); 313 314 $slashed_home = trailingslashit( get_option( 'home' ) ); 314 315 $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 ) ); 316 $wp_siteurl_subdir = preg_replace( '#^' . preg_quote( $home_path, '#' ) . '#', '', ABSPATH ); 317 317 $rewrite_base = ! empty( $wp_siteurl_subdir ) ? ltrim( trailingslashit( $wp_siteurl_subdir ), '/' ) : ''; 318 318 319 $home_path = get_home_path();320 321 319 $location_of_wp_config = ABSPATH; 322 320 if ( ! file_exists( ABSPATH . 'wp-config.php' ) && file_exists( dirname( ABSPATH ) . '/wp-config.php' ) ) 323 321 $location_of_wp_config = trailingslashit( dirname( ABSPATH ) );