From 764331ccefe9260df1605141bf2f173695f2c9b7 Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Fri, 28 May 2010 02:58:21 +0000 Subject: [PATCH] Better branching to account for mod_rewrite mimicry. see #12758. git-svn-id: https://develop.svn.wordpress.org/trunk@15026 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/network.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-admin/network.php b/wp-admin/network.php index 6b847a653a..aed7b2a40d 100644 --- a/wp-admin/network.php +++ b/wp-admin/network.php @@ -175,11 +175,11 @@ function network_step1( $errors = false ) { $subdomain_install = true; } else { $subdomain_install = false; - if ( got_mod_rewrite() ) // dangerous assumptions + if ( $got_mod_rewrite = got_mod_rewrite() ) // dangerous assumptions echo '

' . __( 'Note:' ) . ' ' . __( 'Please make sure the Apache mod_rewrite module is installed as it will be used at the end of this installation.' ) . '

'; elseif ( $is_apache ) echo '

' . __( 'Warning!' ) . ' ' . __( 'It looks like the Apache mod_rewrite module is not installed.' ) . '

'; - if ( $is_apache ) + if ( $got_mod_rewrite || $is_apache ) // Protect against mod_rewrite mimicry (but ! Apache) echo '

' . __( 'If mod_rewrite is disabled, ask your administrator to enable that module, or look at the Apache documentation or elsewhere for help setting it up.' ) . '

'; }