Changeset 15025

Timestamp:

05/28/2010 02:52:40 AM (16 years ago)

Author:

nacin

Message:

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

File:

• trunk/wp-admin/network.php (modified) (3 diffs)

trunk/wp-admin/network.php

@@ -117 +117 @@
  */
 function network_step1( $errors = false ) {
+        global $is_apache;
 
         if ( get_option( 'siteurl' ) != get_option( 'home' ) ) {
@@ -167 +168 @@
         <?php
 
-        // @todo IIS and ! $is_apache
         if ( isset( $_POST['subdomain_install'] ) ) {
                 $subdomain_install = (bool) $_POST['subdomain_install'];
@@ -178 +178 @@
                 if ( got_mod_rewrite() ) // dangerous assumptions
                         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>';
-                else
+                elseif ( $is_apache )
                         echo '<div class="error inline"><p><strong>' . __( 'Warning!' ) . '</strong> ' . __( 'It looks like the Apache <code>mod_rewrite</code> module is not installed.' ) . '</p>';
-                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>';
+                if ( $is_apache )
+                        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>';
         }