WordPress.org

Make WordPress Core

Changeset 15025


Ignore:
Timestamp:
05/28/2010 02:52:40 AM (8 years ago)
Author:
nacin
Message:

Add some Apache checks to some notices in network.php. see #12758.

File:
1 edited

Legend:

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

    r15024 r15025  
    117117 */
    118118function network_step1( $errors = false ) {
     119    global $is_apache;
    119120
    120121    if ( get_option( 'siteurl' ) != get_option( 'home' ) ) {
     
    167168    <?php
    168169
    169     // @todo IIS and ! $is_apache
    170170    if ( isset( $_POST['subdomain_install'] ) ) {
    171171        $subdomain_install = (bool) $_POST['subdomain_install'];
     
    178178        if ( got_mod_rewrite() ) // dangerous assumptions
    179179            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 installation.' ) . '</p>';
    180         else
     180        elseif ( $is_apache )
    181181            echo '<div class="error inline"><p><strong>' . __( 'Warning!' ) . '</strong> ' . __( 'It looks like the Apache <code>mod_rewrite</code> module is not installed.' ) . '</p>';
    182         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>';
     182        if ( $is_apache )
     183            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>';
    183184    }
    184185
Note: See TracChangeset for help on using the changeset viewer.