Ticket #22639: 22639.diff

wp-admin/network.php

@@ -315 +315 @@
         $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 ) );
         $rewrite_base      = ! empty( $wp_siteurl_subdir ) ? ltrim( trailingslashit( $wp_siteurl_subdir ), '/' ) : '';
+        $home_path = ABSPATH;
+        if ( '/' != $wp_dir_from_root )
+                $home_path = trailingslashit( str_replace( $wp_dir_from_root, '', ABSPATH ) );
 
         // Wildcard DNS message.
         if ( is_wp_error( $errors ) )
@@ -349 +352 @@
                 <h3><?php esc_html_e( 'Enabling the Network' ); ?></h3>
                 <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( trailingslashit( $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( trailingslashit( $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
                                 _e( '<strong>Caution:</strong> We recommend you back up your existing <code>wp-config.php</code> file.' );
@@ -454 +457 @@
 EOF;
 
         ?>
-                <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' )
                         echo '<p><strong>' . __('Warning:') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';
@@ -488 +491 @@
 EOF;
 
                 ?>
-                <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' )
                         echo '<p><strong>' . __('Warning:') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';