X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/f9001779751f83dc8a10e478bfecb4d8dd5f964c..6c8f14c09105d0afa4c1574215c59b5021040e76:/wp-includes/ms-load.php diff --git a/wp-includes/ms-load.php b/wp-includes/ms-load.php index 353cbe2f..6a26b9cf 100644 --- a/wp-includes/ms-load.php +++ b/wp-includes/ms-load.php @@ -69,7 +69,9 @@ function wp_get_active_network_plugins() { * @return bool|string Returns true on success, or drop-in file to include. */ function ms_site_check() { - global $wpdb, $current_blog; + global $wpdb; + + $blog = get_blog_details(); // Allow short-circuiting $check = apply_filters('ms_site_check', null); @@ -80,21 +82,21 @@ function ms_site_check() { if ( is_super_admin() ) return true; - if ( '1' == $current_blog->deleted ) { + if ( '1' == $blog->deleted ) { if ( file_exists( WP_CONTENT_DIR . '/blog-deleted.php' ) ) return WP_CONTENT_DIR . '/blog-deleted.php'; else wp_die( __( 'This user has elected to delete their account and the content is no longer available.' ), '', array( 'response' => 410 ) ); } - if ( '2' == $current_blog->deleted ) { + if ( '2' == $blog->deleted ) { if ( file_exists( WP_CONTENT_DIR . '/blog-inactive.php' ) ) return WP_CONTENT_DIR . '/blog-inactive.php'; else wp_die( sprintf( __( 'This site has not been activated yet. If you are having problems activating your site, please contact %1$s.' ), str_replace( '@', ' AT ', get_site_option( 'admin_email', "support@{$current_site->domain}" ) ) ) ); } - if ( $current_blog->archived == '1' || $current_blog->spam == '1' ) { + if ( $blog->archived == '1' || $blog->spam == '1' ) { if ( file_exists( WP_CONTENT_DIR . '/blog-suspended.php' ) ) return WP_CONTENT_DIR . '/blog-suspended.php'; else @@ -119,8 +121,8 @@ function get_current_site_name( $current_site ) { $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 ) $current_site->site_name = ucfirst( $current_site->domain ); + wp_cache_set( $current_site->id . ':site_name', $current_site->site_name, 'site-options' ); } - wp_cache_set( $current_site->id . ':site_name', $current_site->site_name, 'site-options' ); return $current_site; } @@ -134,6 +136,10 @@ function get_current_site_name( $current_site ) { */ function wpmu_current_site() { global $wpdb, $current_site, $domain, $path, $sites, $cookie_domain; + + if ( empty( $current_site ) ) + $current_site = new stdClass; + if ( defined( 'DOMAIN_CURRENT_SITE' ) && defined( 'PATH_CURRENT_SITE' ) ) { $current_site->id = defined( 'SITE_ID_CURRENT_SITE' ) ? SITE_ID_CURRENT_SITE : 1; $current_site->domain = DOMAIN_CURRENT_SITE; @@ -207,10 +213,12 @@ function wpmu_current_site() { } // Still no dice. + wp_load_translations_early(); + if ( 1 == count( $sites ) ) - wp_die( sprintf( /*WP_I18N_BLOG_DOESNT_EXIST*/'That site does not exist. Please try %s.'/*/WP_I18N_BLOG_DOESNT_EXIST*/, $sites[0]->domain . $sites[0]->path ) ); + wp_die( sprintf( __( 'That site does not exist. Please try %s.' ), 'http://' . $sites[0]->domain . $sites[0]->path ) ); else - wp_die( /*WP_I18N_NO_SITE_DEFINED*/'No site defined on this host. If you are the owner of this site, please check Debugging a WordPress Network for help.'/*/WP_I18N_NO_SITE_DEFINED*/ ); + wp_die( __( 'No site defined on this host. If you are the owner of this site, please check Debugging a WordPress Network for help.' ) ); } /** @@ -224,19 +232,21 @@ function wpmu_current_site() { function ms_not_installed() { global $wpdb, $domain, $path; - $title = /*WP_I18N_FATAL_ERROR*/'Error establishing database connection'/*/WP_I18N_FATAL_ERROR*/; + wp_load_translations_early(); + + $title = __( 'Error establishing a database connection' ); $msg = '

' . $title . '

'; if ( ! is_admin() ) die( $msg ); - $msg .= '

' . /*WP_I18N_CONTACT_OWNER*/'If your site does not display, please contact the owner of this network.'/*/WP_I18N_CONTACT_OWNER*/ . ''; - $msg .= ' ' . /*WP_I18N_CHECK_MYSQL*/'If you are the owner of this network please check that MySQL is running properly and all tables are error free.'/*/WP_I18N_CHECK_MYSQL*/ . '

'; + $msg .= '

' . __( 'If your site does not display, please contact the owner of this network.' ) . ''; + $msg .= ' ' . __( 'If you are the owner of this network please check that MySQL is running properly and all tables are error free.' ) . '

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

' . sprintf( /*WP_I18N_TABLES_MISSING_LONG*/'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.'/*/WP_I18N_TABLES_MISSING_LONG*/, $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( /*WP_I18N_NO_SITE_FOUND*/'Could not find site %1$s. Searched for table %2$s in database %3$s. Is that right?'/*/WP_I18N_NO_SITE_FOUND*/, rtrim( $domain . $path, '/' ), $wpdb->blogs, DB_NAME ) . '

'; - $msg .= '

' . /*WP_I18N_WHAT_DO_I_DO*/'What do I do now?'/*WP_I18N_WHAT_DO_I_DO*/ . ' '; - $msg .= /*WP_I18N_RTFM*/'Read the bug report page. Some of the guidelines there may help you figure out what went wrong.'/*/WP_I18N_RTFM*/; - $msg .= ' ' . /*WP_I18N_STUCK*/'If you’re still stuck with this message, then check that your database contains the following tables:'/*/WP_I18N_STUCK*/ . '