From d49e62fa35872312d1059dbe69e0a4eec7168e4a Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Sun, 23 May 2010 22:19:09 +0000 Subject: [PATCH] Show warning in network.php if using a custom wp-content directory. fixes #11742. git-svn-id: https://develop.svn.wordpress.org/trunk@14825 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/network.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/wp-admin/network.php b/wp-admin/network.php index 4a22828140..2fe58a434c 100644 --- a/wp-admin/network.php +++ b/wp-admin/network.php @@ -146,6 +146,9 @@ function network_step1( $errors = false ) { $error_codes = $errors->get_error_codes(); } + if ( WP_CONTENT_DIR != ABSPATH . 'wp-content' ) + echo '

' . __('Warning!') . ' ' . __( 'Networks may not be fully compatible with custom wp-content directories.' ) . '

'; + $site_name = ( ! empty( $_POST['sitename'] ) && ! in_array( 'empty_sitename', $error_codes ) ) ? $_POST['sitename'] : sprintf( _x('%s Sites', 'Default network name' ), get_option( 'blogname' ) ); $admin_email = ( ! empty( $_POST['email'] ) && ! in_array( 'invalid_email', $error_codes ) ) ? $_POST['email'] : get_option( 'admin_email' ); ?> @@ -287,7 +290,11 @@ function network_step2( $errors = false ) { } ?>
    -

  1. blogs.dir directory in %s. This directory is used to stored uploaded media for your additional sites and must be writeable by the web server.' ), WP_CONTENT_DIR ); ?>

    2. +

  2. blogs.dir directory in %s. This directory is used to stored uploaded media for your additional sites and must be writeable by the web server.' ), WP_CONTENT_DIR ); + if ( WP_CONTENT_DIR != ABSPATH . 'wp-content' ) + echo ' ' . __('Warning:') . ' ' . __( 'Networks may not be fully compatible with custom wp-content directories.' ) . '

  3. wp-config.php file in %s above the line reading /* That’s all, stop editing! Happy blogging. */:' ), ABSPATH ); ?>