WordPress.org

Make WordPress Core

Changeset 13782


Ignore:
Timestamp:
03/20/2010 10:44:07 PM (9 years ago)
Author:
nacin
Message:

Some improvements to the network.php mod_rewrite checks. see #12255

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/network.php

    r13733 r13782  
    118118    <?php
    119119
    120     // @todo IIS...
    121     if ( ! empty( $_POST['subdomain_install'] ) ) {
     120    // @todo IIS and ! $is_apache
     121    if ( isset( $_POST['subdomain_install'] ) ) {
    122122        $subdomain_install = (bool) $_POST['subdomain_install'];
    123123    } elseif ( apache_mod_loaded('mod_rewrite') ) { // assume nothing
     
    126126        $subdomain_install = false;
    127127        if ( got_mod_rewrite() ) // dangerous assumptions
    128             echo '<p>' . __( 'Please make sure the Apache <code>mod_rewrite</code> module is installed as it will be used at the end of this install.' ) . '</p>';
     128            echo '<div class="updated inline"><p><strong>' . __( 'Note:' ) . '</strong> ' . __( 'Please make sure the Apache <code>mod_rewrite</code> module is installed as it will be used at the end of this install.' ) . '</p>';
    129129        else
    130             echo '<p>' . __( '<strong>Warning!</strong> It looks like Apache <code>mod_rewrite</code> module is not installed.' ) . '</p>';
    131         echo '<p>' . __( 'If <code>mod_rewrite</code> is disabled ask your administrator to enable that module, or look at the <a href="http://httpd.apache.org/docs/mod/mod_rewrite.html">Apache documentation</a> or <a href="http://www.google.com/search?q=apache+mod_rewrite">elsewhere</a> for help setting it up.' ) . '</p>';
     130            echo '<div class="error inline"><p><strong>' . __( 'Warning!' ) . '</strong> ' . __( 'It looks like the Apache <code>mod_rewrite</code> module is not installed.' ) . '</p>';
     131        echo '<p>' . __( 'If <code>mod_rewrite</code> is disabled, ask your administrator to enable that module, or look at the <a href="http://httpd.apache.org/docs/mod/mod_rewrite.html">Apache documentation</a> or <a href="http://www.google.com/search?q=apache+mod_rewrite">elsewhere</a> for help setting it up.' ) . '</p></div>';
    132132    }
    133133
     
    136136        <p><?php _e( 'Please choose whether you would like sites in your WordPress network to use sub-domains or sub-directories. <strong>You cannot change this later.</strong>' ); ?></p>
    137137        <p><?php _e( "You will need a wildcard DNS record if you're going to use the virtual host (sub-domain) functionality." ); ?></p>
    138         <?php /* @todo: Link to an MS readme? */ ?>
    139         <?php if ( ! $subdomain_install ) { ?>
    140         <p><?php _e( '<strong>Note</strong> It looks like <code>mod_rewrite</code> is not installed.' ); ?></p>
    141         <?php } ?>
     138        <?php // @todo: Link to an MS readme? ?>
    142139        <table class="form-table">
    143140            <tr>
Note: See TracChangeset for help on using the changeset viewer.