WordPress.org

Make WordPress Core

Changeset 13392


Ignore:
Timestamp:
02/24/10 23:12:51 (4 years ago)
Author:
wpmuguru
Message:

Warnings, code & UI/UX cleanup, See #11644

File:
1 edited

Legend:

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

    r13254 r13392  
    5252            return WP_CONTENT_DIR . '/blog-inactive.php'; 
    5353        else 
    54             wp_die( sprintf( __( 'This blog has not been activated yet. If you are having problems activating your blog, please contact <a href="mailto:%1$s">%1$s</a>.' ), str_replace( '@', ' AT ', get_site_option( 'admin_email', "support@{$current_site->domain}" ) ) ) ); 
     54            wp_die( sprintf( __( 'This site has not been activated yet. If you are having problems activating your site, please contact <a href="mailto:%1$s">%1$s</a>.' ), str_replace( '@', ' AT ', get_site_option( 'admin_email', "support@{$current_site->domain}" ) ) ) ); 
    5555    } 
    5656 
     
    111111            $current_site->cookie_domain = $current_site->domain; 
    112112 
    113         wp_load_core_site_options($current_site->id); 
     113        wp_load_core_site_options( $current_site->id ); 
    114114 
    115115        return $current_site; 
     
    122122    $sites = $wpdb->get_results( "SELECT * FROM $wpdb->site" ); // usually only one site 
    123123    if ( 1 == count( $sites ) ) { 
    124         wp_load_core_site_options($current_site->id); 
    125124        $current_site = $sites[0]; 
     125        wp_load_core_site_options( $current_site->id ); 
    126126        $path = $current_site->path; 
    127127        $current_site->blog_id = $wpdb->get_var( $wpdb->prepare( "SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s", $current_site->domain, $current_site->path ) ); 
     
    188188 
    189189    $msg = '<h1>' . esc_html__( 'Fatal Error' ) . '</h1>'; 
    190     $msg  = '<p>' . __( 'If your blog does not display, please contact the owner of this site.' ) . '</p>'; 
    191     $msg .= '<p>' . __( 'If you are the owner of this site please check that MySQL is running properly and all tables are error free.' ) . '</p>'; 
     190    $msg  = '<p>' . __( 'If your site does not display, please contact the owner of this network.' ) . '</p>'; 
     191    $msg .= '<p>' . __( 'If you are the owner of this network please check that MySQL is running properly and all tables are error free.' ) . '</p>'; 
    192192    if ( ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) ) 
    193193        $msg .= '<p>' . sprintf( __( '<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 <em>should</em> look at your database now.' ), $wpdb->site ) . '</p>'; 
    194194    else 
    195         $msg .= '<p>' . sprintf( __( '<strong>Could Not Find Blog!</strong> Searched for table <em>%1$s</em> in <code>%2$s</code>. Is that right?' ), $domain . $path, DB_NAME, $wpdb->blogs ) . '</p>'; 
     195        $msg .= '<p>' . sprintf( __( '<strong>Could Not Find Site!</strong> Searched for table <em>%1$s</em> in <code>%2$s</code>. Is that right?' ), $domain . $path, DB_NAME, $wpdb->blogs ) . '</p>'; 
    196196    $msg .= '<h1>' . esc_html__( 'What do I do now?' ) . '</h1>'; 
    197197    // @todo Update WPMU codex link. 
Note: See TracChangeset for help on using the changeset viewer.