Add some Apache checks to some notices in network.php. see #12758.
git-svn-id: http://svn.automattic.com/wordpress/trunk@15025 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
52f9c18958
commit
1e3784ca4c
|
@ -116,6 +116,7 @@ include( './admin-header.php' );
|
||||||
* @since 3.0.0
|
* @since 3.0.0
|
||||||
*/
|
*/
|
||||||
function network_step1( $errors = false ) {
|
function network_step1( $errors = false ) {
|
||||||
|
global $is_apache;
|
||||||
|
|
||||||
if ( get_option( 'siteurl' ) != get_option( 'home' ) ) {
|
if ( get_option( 'siteurl' ) != get_option( 'home' ) ) {
|
||||||
echo '<div class="error"><p><strong>' . __('Error:') . '</strong> ' . sprintf( __( 'Your <strong>WordPress address</strong> must match your <strong>Site address</strong> before creating a Network. See <a href="%s">General Settings</a>.' ), esc_url( admin_url( 'options-general.php' ) ) ) . '</p></div>';
|
echo '<div class="error"><p><strong>' . __('Error:') . '</strong> ' . sprintf( __( 'Your <strong>WordPress address</strong> must match your <strong>Site address</strong> before creating a Network. See <a href="%s">General Settings</a>.' ), esc_url( admin_url( 'options-general.php' ) ) ) . '</p></div>';
|
||||||
|
@ -166,7 +167,6 @@ function network_step1( $errors = false ) {
|
||||||
<p><?php _e( 'Fill in the information below and you’ll be on your way to creating a network of WordPress sites. We will create configuration files in the next step.' ); ?></p>
|
<p><?php _e( 'Fill in the information below and you’ll be on your way to creating a network of WordPress sites. We will create configuration files in the next step.' ); ?></p>
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
// @todo IIS and ! $is_apache
|
|
||||||
if ( isset( $_POST['subdomain_install'] ) ) {
|
if ( isset( $_POST['subdomain_install'] ) ) {
|
||||||
$subdomain_install = (bool) $_POST['subdomain_install'];
|
$subdomain_install = (bool) $_POST['subdomain_install'];
|
||||||
} elseif ( apache_mod_loaded('mod_rewrite') ) { // assume nothing
|
} elseif ( apache_mod_loaded('mod_rewrite') ) { // assume nothing
|
||||||
|
@ -177,9 +177,10 @@ function network_step1( $errors = false ) {
|
||||||
$subdomain_install = false;
|
$subdomain_install = false;
|
||||||
if ( got_mod_rewrite() ) // dangerous assumptions
|
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>';
|
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 '<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>';
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( allow_subdomain_install() && allow_subdirectory_install() ) : ?>
|
if ( allow_subdomain_install() && allow_subdirectory_install() ) : ?>
|
||||||
|
|
Loading…
Reference in New Issue