From 182903034bb2ffe2ef39a45e9d7d2557095cc577 Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Thu, 6 Feb 2014 22:22:13 +0000 Subject: [PATCH] Network install: When showing the path to wp-config.php make sure our slashes are normalized. props VarunAgw. fixes #27025. Built from https://develop.svn.wordpress.org/trunk@27112 git-svn-id: http://core.svn.wordpress.org/trunk@26979 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/network.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/wp-admin/network.php b/wp-admin/network.php index fe7effe001..9446243909 100644 --- a/wp-admin/network.php +++ b/wp-admin/network.php @@ -329,9 +329,11 @@ function network_step2( $errors = false ) { $rewrite_base = ! empty( $wp_siteurl_subdir ) ? ltrim( trailingslashit( $wp_siteurl_subdir ), '/' ) : ''; - $location_of_wp_config = ABSPATH; - if ( ! file_exists( ABSPATH . 'wp-config.php' ) && file_exists( dirname( ABSPATH ) . '/wp-config.php' ) ) - $location_of_wp_config = trailingslashit( dirname( ABSPATH ) ); + $location_of_wp_config = $abspath_fix; + if ( ! file_exists( ABSPATH . 'wp-config.php' ) && file_exists( dirname( ABSPATH ) . '/wp-config.php' ) ) { + $location_of_wp_config = dirname( $abspath_fix ); + } + $location_of_wp_config = trailingslashit( $location_of_wp_config ); // Wildcard DNS message. if ( is_wp_error( $errors ) )