Wordpress 3.3.1-scripts

[autoinstalls/wordpress.git] / wp-includes / ms-load.php

diff --git a/wp-includes/ms-load.php b/wp-includes/ms-load.php
index 353cbe2fee5a1877f04bfa6a69babb31e6effc78..5ff0526fdf59411506a87b021b81536cee6eea90 100644 (file)
--- a/wp-includes/ms-load.php
+++ b/wp-includes/ms-load.php
@@ -119,8 +119,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 +134,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;
@@ -234,7 +238,7 @@ function ms_not_installed() {
                $msg .= '<p>' . sprintf( /*WP_I18N_TABLES_MISSING_LONG*/'<strong>Database tables are missing.</strong> This means that MySQL is not running, WordPress was not installed properly, or someone deleted <code>%s</code>. You really should look at your database now.'/*/WP_I18N_TABLES_MISSING_LONG*/, $wpdb->site ) . '</p>';
        else
                $msg .= '<p>' . sprintf( /*WP_I18N_NO_SITE_FOUND*/'<strong>Could not find site <code>%1$s</code>.</strong> Searched for table <code>%2$s</code> in database <code>%3$s</code>. Is that right?'/*/WP_I18N_NO_SITE_FOUND*/, rtrim( $domain . $path, '/' ), $wpdb->blogs, DB_NAME ) . '</p>';
-       $msg .= '<p><strong>' . /*WP_I18N_WHAT_DO_I_DO*/'What do I do now?'/*WP_I18N_WHAT_DO_I_DO*/ . '</strong> ';
+       $msg .= '<p><strong>' . /*WP_I18N_WHAT_DO_I_DO*/'What do I do now?'/*/WP_I18N_WHAT_DO_I_DO*/ . '</strong> ';
        $msg .= /*WP_I18N_RTFM*/'Read the <a target="_blank" href="http://codex.wordpress.org/Debugging_a_WordPress_Network">bug report</a> page. Some of the guidelines there may help you figure out what went wrong.'/*/WP_I18N_RTFM*/;
        $msg .= ' ' . /*WP_I18N_STUCK*/'If you&#8217;re still stuck with this message, then check that your database contains the following tables:'/*/WP_I18N_STUCK*/ . '</p><ul>';
        foreach ( $wpdb->tables('global') as $t => $table ) {