X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/256a3b381f63716209b3527d0a14442ae570c283..1132430022383fdf47fa6cb9377300fd885297aa:/wp-admin/network.php?ds=inline diff --git a/wp-admin/network.php b/wp-admin/network.php index fe7effe0..051295a1 100644 --- a/wp-admin/network.php +++ b/wp-admin/network.php @@ -39,8 +39,11 @@ foreach ( $wpdb->tables( 'ms_global' ) as $table => $prefixed_table ) */ function network_domain_check() { global $wpdb; - if ( $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) ) + + $sql = $wpdb->prepare( "SHOW TABLES LIKE %s", $wpdb->esc_like( $wpdb->site ) ); + if ( $wpdb->get_var( $sql ) ) { return $wpdb->get_var( "SELECT domain FROM $wpdb->site ORDER BY id ASC LIMIT 1" ); + } return false; } @@ -130,7 +133,7 @@ get_current_screen()->set_help_sidebar( '
' . __('For more information:') . '
' . '' . __('Documentation on Creating a Network') . '
' . '' . __('Documentation on the Network Screen') . '
' . - '' . __('Support Forums') . '
' + '' . __('Support Forums') . '
' ); include( ABSPATH . 'wp-admin/admin-header.php' ); @@ -153,7 +156,7 @@ function network_step1( $errors = false ) { if ( defined('DO_NOT_UPGRADE_GLOBAL_TABLES') ) { echo '' . __('ERROR:') . ' ' . __( 'The constant DO_NOT_UPGRADE_GLOBAL_TABLES cannot be defined when creating a network.' ) . '
+ | site1.%1$s and site2.%1$s ', 'subdomain examples' ), $hostname ); ?> |
|
---|---|---|
+ | %1$s/site1 and %1$s/site2 ', 'subdirectory examples' ), $hostname ); ?> |
wp-config.php file in %s
above the line reading /* That’s all, stop editing! Happy blogging. */
:' ), $location_of_wp_config ); ?>
web.config file in %s
, replacing other WordPress rules:' ), $home_path ); ?>
';
+ /* translators: 1: a filename like .htaccess. 2: a file path. */
+ printf( __( 'Add the following to your %1$s file in %2$s, replacing other WordPress rules:' ),
+ 'web.config
', '' . $home_path . '
' );
+ echo '
' . __('Warning:') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '
'; ?> @@ -482,7 +491,7 @@ define('BLOG_ID_CURRENT_SITE', 1); $ms_files_rewriting = ''; if ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) { $ms_files_rewriting = "\n# uploaded files\nRewriteRule ^"; - $ms_files_rewriting .= $subdir_match . "files/(.+) {$rewrite_base}wp-includes/ms-files.php?file={$subdir_replacement_12} [L]" . "\n"; + $ms_files_rewriting .= $subdir_match . "files/(.+) {$rewrite_base}" . WPINC . "/ms-files.php?file={$subdir_replacement_12} [L]" . "\n"; } $htaccess_file = <<.htaccess file in %s
, replacing other WordPress rules:' ), $home_path ); ?>
';
+ /* translators: 1: a filename like .htaccess. 2: a file path. */
+ printf( __( 'Add the following to your %1$s file in %2$s, replacing other WordPress rules:' ),
+ '.htaccess
', '' . $home_path . '
' );
+ echo '
' . __('Warning:') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '
'; ?> @@ -524,7 +536,7 @@ if ( $_POST ) { check_admin_referer( 'install-network-1' ); require_once( ABSPATH . 'wp-admin/includes/upgrade.php' ); - // create network tables + // Create network tables. install_network(); $base = parse_url( trailingslashit( get_option( 'home' ) ), PHP_URL_PATH ); $subdomain_install = allow_subdomain_install() ? !empty( $_POST['subdomain_install'] ) : false;