WordPress.org

Make WordPress Core

Ticket #22639: 22639.7.diff

File 22639.7.diff, 2.8 KB (added by nacin, 5 years ago)

A refresh of 3.diff. Fixes the messages only, as the rewrites seem correct.

  • wp-admin/network.php

     
    316316        $wp_siteurl_subdir = trailingslashit( '/' . preg_replace( '#^' . preg_quote( $base, '#' ) . '#', '', $wp_dir_from_root ) );
    317317        $rewrite_base      = ! empty( $wp_siteurl_subdir ) ? ltrim( trailingslashit( $wp_siteurl_subdir ), '/' ) : '';
    318318
     319        $home_path         = get_home_path();
     320
    319321        $location_of_wp_config = ABSPATH;
    320322        if ( ! file_exists( ABSPATH . 'wp-config.php' ) && file_exists( dirname( ABSPATH ) . '/wp-config.php' ) )
    321323                $location_of_wp_config = trailingslashit( dirname( ABSPATH ) );
     
    353355                <h3><?php esc_html_e( 'Enabling the Network' ); ?></h3>
    354356                <p><?php _e( 'Complete the following steps to enable the features for creating a network of sites.' ); ?></p>
    355357                <div class="updated inline"><p><?php
    356                         if ( file_exists( ABSPATH . '.htaccess' ) )
     358                        if ( file_exists( $home_path . '.htaccess' ) )
    357359                                printf( __( '<strong>Caution:</strong> We recommend you back up your existing <code>wp-config.php</code> and <code>%s</code> files.' ), '.htaccess' );
    358                         elseif ( file_exists( ABSPATH . 'web.config' ) )
     360                        elseif ( file_exists( $home_path . 'web.config' ) )
    359361                                printf( __( '<strong>Caution:</strong> We recommend you back up your existing <code>wp-config.php</code> and <code>%s</code> files.' ), 'web.config' );
    360362                        else
    361363                                _e( '<strong>Caution:</strong> We recommend you back up your existing <code>wp-config.php</code> file.' );
     
    458460EOF;
    459461
    460462        ?>
    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>
     463                <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>
    462464                <?php
    463465                if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . 'wp-content' )
    464466                        echo '<p><strong>' . __('Warning:') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';
     
    492494EOF;
    493495
    494496                ?>
    495                 <li><p><?php printf( __( 'Add the following to your <code>.htaccess</code> file in <code>%s</code>, replacing other WordPress rules:' ), ABSPATH ); ?></p>
     497                <li><p><?php printf( __( 'Add the following to your <code>.htaccess</code> file in <code>%s</code>, replacing other WordPress rules:' ), $home_path ); ?></p>
    496498                <?php
    497499                if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . 'wp-content' )
    498500                        echo '<p><strong>' . __('Warning:') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';