Changeset 22982 for trunk/wp-admin/network.php

Timestamp:

12/03/2012 03:42:02 AM (14 years ago)

Author:

nacin

Message:

When creating a network, use get_home_path() to calculate where .htaccess (or web.config) lives. fixes #22639.

File:

• trunk/wp-admin/network.php (modified) (5 diffs)

trunk/wp-admin/network.php

@@ -317 +317 @@
         $rewrite_base      = ! empty( $wp_siteurl_subdir ) ? ltrim( trailingslashit( $wp_siteurl_subdir ), '/' ) : '';
 
+        $home_path         = get_home_path();
+
         $location_of_wp_config = ABSPATH;
         if ( ! file_exists( ABSPATH . 'wp-config.php' ) && file_exists( dirname( ABSPATH ) . '/wp-config.php' ) )
@@ -345 +347 @@
         }
 
-        $subdir_match        = $subdomain_install ? '' : '([_0-9a-zA-Z-]+/)?';
+        $subdir_match          = $subdomain_install ? '' : '([_0-9a-zA-Z-]+/)?';
         $subdir_replacement_01 = $subdomain_install ? '' : '$1';
         $subdir_replacement_12 = $subdomain_install ? '$1' : '$2';
@@ -354 +356 @@
                 <p><?php _e( 'Complete the following steps to enable the features for creating a network of sites.' ); ?></p>
                 <div class="updated inline"><p><?php
-                        if ( file_exists( ABSPATH . '.htaccess' ) )
+                        if ( file_exists( $home_path . '.htaccess' ) )
                                 printf( __( '<strong>Caution:</strong> We recommend you back up your existing <code>wp-config.php</code> and <code>%s</code> files.' ), '.htaccess' );
-                        elseif ( file_exists( ABSPATH . 'web.config' ) )
+                        elseif ( file_exists( $home_path . 'web.config' ) )
                                 printf( __( '<strong>Caution:</strong> We recommend you back up your existing <code>wp-config.php</code> and <code>%s</code> files.' ), 'web.config' );
                         else
@@ -459 +461 @@
 
         ?>
-                <li><p><?php printf( __( 'Add the following to your <code>web.config</code> file in <code>%s</code>, replacing other WordPress rules:' ), trailingslashit( str_replace( trailingslashit( $wp_siteurl_subdir ), '', ABSPATH ) ) ); ?></p>
+                <li><p><?php printf( __( 'Add the following to your <code>web.config</code> file in <code>%s</code>, replacing other WordPress rules:' ), $home_path ); ?></p>
                 <?php
                 if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . 'wp-content' )
@@ -493 +495 @@
 
                 ?>
-                <li><p><?php printf( __( 'Add the following to your <code>.htaccess</code> file in <code>%s</code>, replacing other WordPress rules:' ), ABSPATH ); ?></p>
+                <li><p><?php printf( __( 'Add the following to your <code>.htaccess</code> file in <code>%s</code>, replacing other WordPress rules:' ), $home_path ); ?></p>
                 <?php
                 if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . 'wp-content' )