Index: wp-includes/default-constants.php =================================================================== --- wp-includes/default-constants.php (revision 12902) +++ wp-includes/default-constants.php (working copy) @@ -1,5 +1,4 @@ blogid}/files/" ); - + /** @since 3.0.0 */ if ( !defined( 'BLOGUPLOADDIR' ) ) define( 'BLOGUPLOADDIR', WP_CONTENT_DIR . "/blogs.dir/{$wpdb->blogid}/files/" ); break; case 'cookies' : global $current_site; /** - * It is possible to define this in wp-config.php * @since 1.2.0 */ if ( !defined( 'COOKIEPATH' ) ) define( 'COOKIEPATH', $current_site->path ); - /** - * It is possible to define this in wp-config.php * @since 1.5.0 */ if ( !defined( 'SITECOOKIEPATH' ) ) define( 'SITECOOKIEPATH', $current_site->path ); - /** - * It is possible to define this in wp-config.php * @since 2.6.0 */ if ( !defined( 'ADMIN_COOKIE_PATH' ) ) { @@ -53,7 +49,6 @@ } } /** - * It is possible to define this in wp-config.php * @since 2.0.0 */ if ( !defined('COOKIE_DOMAIN') ) Index: wp-includes/ms-load.php =================================================================== --- wp-includes/ms-load.php (revision 12902) +++ wp-includes/ms-load.php (working copy) @@ -9,7 +9,7 @@ */ /** - * Whether a subdomain configuration is enabled + * Whether a subdomain configuration is enabled. * * @since 3.0 * @@ -22,16 +22,13 @@ return false; } -function ms_network_settings() { - global $wpdb, $current_site, $cookiehash; - - if ( !isset($current_site->site_name) ) - $current_site->site_name = get_site_option('site_name'); - - if ( $current_site->site_name == false ) - $current_site->site_name = ucfirst( $current_site->domain ); -} - +/** + * Returns array of sitewide plugin files to be included in global scope. + * + * @access private + * @since 3.0.0 + * @return array Files to include + */ function ms_network_plugins() { $network_plugins = array(); $deleted_sitewide_plugins = array(); @@ -62,6 +59,19 @@ return $network_plugins; } +/** + * Checks status of current blog. + * + * Checks if the blog is deleted, inactive, archived, or spammed. + * + * Dies with a default message if the blog does not pass the check. + * + * To change the default message when a blog does not pass the check, + * use the wp-content/blog-deleted.php, blog-inactive.php and + * blog-suspended.php drop-ins. + * + * @return bool|string Returns true on success, or drop-in file to include. + */ function ms_site_check() { global $wpdb, $current_blog; @@ -69,10 +79,12 @@ if ( file_exists( WP_CONTENT_DIR . '/blog-deleted.php' ) ) { return WP_CONTENT_DIR . '/blog-deleted.php'; } else { - header('HTTP/1.1 410 Gone'); - wp_die(__('This user has elected to delete their account and the content is no longer available.')); + header( 'HTTP/1.1 410 Gone' ); + wp_die( __( 'This user has elected to delete their account and the content is no longer available.' ) ); } - } elseif ( '2' == $current_blog->deleted ) { + } + + if ( '2' == $current_blog->deleted ) { if ( file_exists( WP_CONTENT_DIR . '/blog-inactive.php' ) ) return WP_CONTENT_DIR . '/blog-inactive.php'; else @@ -83,22 +95,28 @@ if ( file_exists( WP_CONTENT_DIR . '/blog-suspended.php' ) ) { return WP_CONTENT_DIR . '/blog-suspended.php'; } else { - header('HTTP/1.1 410 Gone'); - wp_die(__('This blog has been archived or suspended.')); + header( 'HTTP/1.1 410 Gone' ); + wp_die( __( 'This blog has been archived or suspended.' ) ); } } return true; } +/** + * Gets current site name. + * + * @since 3.0.0 + * @return string Name of site + */ function get_current_site_name( $current_site ) { global $wpdb; $current_site->site_name = wp_cache_get( $current_site->id . ':current_site_name', "site-options" ); - if ( !$current_site->site_name ) { + if ( ! $current_site->site_name ) { $current_site->site_name = $wpdb->get_var( $wpdb->prepare( "SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = %d AND meta_key = 'site_name'", $current_site->id ) ); - if ( $current_site->site_name == null ) + if ( ! $current_site->site_name ) $current_site->site_name = ucfirst( $current_site->domain ); - wp_cache_set( $current_site->id . ':current_site_name', $current_site->site_name, 'site-options'); + wp_cache_set( $current_site->id . ':current_site_name', $current_site->site_name, 'site-options' ); } return $current_site; } @@ -186,34 +204,35 @@ function is_installed() { global $wpdb, $domain, $path; $base = stripslashes( $base ); - if ( defined( "WP_INSTALLING" ) == false ) { - $check = $wpdb->get_results( "SELECT * FROM $wpdb->site" ); - $msg = "If your blog does not display, please contact the owner of this site.

If you are the owner of this site please check that MySQL is running properly and all tables are error free.

"; - if ( $check == false ) { - $msg .= "Database Tables Missing.
Database tables are missing. This means that MySQL is either not running, WPMU was not installed properly, or someone deleted {$wpdb->site}. You really should look at your database now.
"; - } else { - $msg .= 'Could Not Find Blog!
'; - $msg .= "Searched for " . $domain . $path . " in " . DB_NAME . "::" . $wpdb->blogs . " table. Is that right?
"; - } - $msg .= "
\n

What do I do now?

"; - $msg .= "Read the bug report page. Some of the guidelines there may help you figure out what went wrong.
"; - $msg .= "If you're still stuck with this message, then check that your database contains the following tables:"; - $msg .= "If you suspect a problem please report it to the support forums but you must include the information asked for in the WPMU bug reporting guidelines!

"; - if ( is_file( 'release-info.txt' ) ) { - $msg .= 'Your bug report must include the following text: "'; - $info = file( 'release-info.txt' ); - $msg .= $info[ 4 ] . '"'; - } + if ( defined( 'WP_INSTALLING' ) ) + return; - die( "

Fatal Error

" . $msg ); + $msg = '

' . esc_html__( 'Fatal Error' ) . '

'; + $msg = '

' . __( 'If your blog does not display, please contact the owner of this site.' ) . '

'; + $msg .= '

' . __( 'If you are the owner of this site please check that MySQL is running properly and all tables are error free.' ) . '

'; + if ( ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) ) + $msg .= '

' . sprintf( __( 'Database tables are missing. This means that MySQL is not running, WordPress was not installed properly, or someone deleted %s. You really should look at your database now.' ), $wpdb->site ) . '

'; + else + $msg .= '

' . sprintf( __( 'Could Not Find Blog! Searched for table %1$s in %2$s. Is that right?' ), $domain . $path, DB_NAME, $wpdb->blogs ) . '

'; + $msg .= '

' . esc_html__( 'What do I do now?' ) . '

'; + // @todo Update WPMU codex link. + $msg .= '

' . __( 'Read the bug report page. Some of the guidelines there may help you figure out what went wrong.' ) . '

'; + $msg .= '

' . __( "If you're still stuck with this message, then check that your database contains the following tables:" ) . '

'; + // @todo Update WPMU codex link and support instructions. + $msg = '

' . __( 'If you suspect a problem please report it to the support forums but you must include the information asked for in the WPMU bug reporting guidelines! ' ) . '

'; + + // @todo This file no longer exists post-merge. + if ( is_file( 'release-info.txt' ) ) { + $msg .= '

' . __( 'Your bug report must include the following text:' ) . '

'; + $info = file( 'release-info.txt' ); + $msg .= $info[ 4 ] . '"'; + } + + die( $msg ); } ?> Index: wp-includes/ms-settings.php =================================================================== --- wp-includes/ms-settings.php (revision 12902) +++ wp-includes/ms-settings.php (working copy) @@ -64,7 +64,7 @@ $blogname = substr( $blogname, 0, strpos( $blogname, '?' ) ); $reserved_blognames = array( 'page', 'comments', 'blog', 'wp-admin', 'wp-includes', 'wp-content', 'files', 'feed' ); if ( $blogname != '' && ! in_array( $blogname, $reserved_blognames ) && ! is_file( $blogname ) ) - $path = $path . $blogname . '/'; + $path .= $blogname . '/'; $current_blog = wp_cache_get( 'current_blog_' . $domain . $path, 'site-options' ); if ( ! $current_blog ) { $current_blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s AND path = %s", $domain, $path ) ); @@ -104,8 +104,6 @@ $current_blog->site_id = 1; $site_id = $current_blog->site_id; -$current_site = get_current_site_name( $current_site ); - if ( ! $blog_id ) { if ( defined('WP_INSTALLING') ) { $current_blog->blog_id = $blog_id = 1; @@ -120,6 +118,8 @@ $wpdb->set_prefix( $table_prefix ); // set up blog tables $table_prefix = $wpdb->get_blog_prefix(); +$current_site = get_current_site_name( $current_site ); + // need to init cache again after blog_id is set wp_start_object_cache(); Index: wp-settings.php =================================================================== --- wp-settings.php (revision 12902) +++ wp-settings.php (working copy) @@ -132,15 +132,9 @@ } // Define constants that rely on the API to obtain the default value. +// Define must-use plugin directory constants, which may be overridden in the sunrise.php drop-in. wp_default_constants( 'wp_included' ); -// Set up multisite if enabled. -if ( is_multisite() ) - ms_network_settings(); - -// Define must-use plugin directory constants, which may be overridden in the sunrise.php drop-in. -wp_default_constants( 'ms_network_settings_loaded' ); - // Load must-use plugins. foreach( wp_muplugins_to_load() as $mu_plugin ) include_once( $mu_plugin );