Ticket #22639: 22639.2.patch

wp-admin/network.php

@@ -349 +349 @@
                 <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( str_replace( $wp_dir_from_root, '', ABSPATH ) ) . '.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( str_replace( $wp_dir_from_root, '', ABSPATH ) ) . '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 +454 @@
 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:' ), trailingslashit( str_replace( $wp_dir_from_root, '', ABSPATH ) ) ); ?></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 +488 @@
 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:' ), trailingslashit( str_replace( $wp_dir_from_root, '', ABSPATH ) ) ); ?></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>';