WordPress.org

Make WordPress Core

Changeset 13254


Ignore:
Timestamp:
02/20/2010 02:07:23 PM (10 years ago)
Author:
nacin
Message:

Minor MS startup cleanups. See #11644

Location:
trunk/wp-includes
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/ms-load.php

    r13253 r13254  
    181181 * Used when blog does not exist. Checks for a missing $wpdb->site table as well.
    182182 *
    183  * @todo Merge with is_blog_installed(), dead_db(), wp_not_installed(), etc.
    184183 * @access private
    185184 * @since 3.0.0
  • trunk/wp-includes/ms-settings.php

    r13253 r13254  
    4949    $current_blog = wp_cache_get( 'current_blog_' . $domain, 'site-options' );
    5050    if ( !$current_blog ) {
    51         $current_blog = get_blog_details( array('domain' => $domain), false );
     51        $current_blog = get_blog_details( array( 'domain' => $domain ), false );
    5252        if ( $current_blog )
    5353            wp_cache_set( 'current_blog_' . $domain, $current_blog, 'site-options' );
     
    6868    $current_blog = wp_cache_get( 'current_blog_' . $domain . $path, 'site-options' );
    6969    if ( ! $current_blog ) {
    70         $current_blog = $current_blog = get_blog_details( array('domain' => $domain, 'path' => $path ), false );
     70        $current_blog = get_blog_details( array( 'domain' => $domain, 'path' => $path ), false );
    7171        if ( $current_blog )
    7272            wp_cache_set( 'current_blog_' . $domain . $path, $current_blog, 'site-options' );
     
    9292            exit;
    9393        }
    94         $current_blog = get_blog_details( array('domain' => $current_site->domain, 'path' => $current_site->path), false );
     94        $current_blog = get_blog_details( array( 'domain' => $current_site->domain, 'path' => $current_site->path ), false );
    9595    }
    9696    if ( ! $current_blog || ! $current_site )
     
    108108
    109109if ( ! $blog_id ) {
    110     if ( defined('WP_INSTALLING') ) {
     110    if ( defined( 'WP_INSTALLING' ) ) {
    111111        $current_blog->blog_id = $blog_id = 1;
    112112    } else {
    113         $msg = ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) ? __( 'Database tables are missing.' ) : '';
     113        $msg = ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) ? ' ' . __( 'Database tables are missing.' ) : '';
    114114        wp_die( __( 'No blog by that name on this system.' ) . $msg );
    115115    }
     
    125125
    126126// Define upload directory constants
    127 ms_upload_constants(  );
     127ms_upload_constants();
    128128
    129129?>
Note: See TracChangeset for help on using the changeset viewer.