WordPress.org

Make WordPress Core


Ignore:
Timestamp:
11/13/2013 03:22:48 AM (8 years ago)
Author:
SergeyBiryukov
Message:

Use get_current_site() instead of the $current_site global when possible.

props jeremyfelt.
fixes #25158.

File:
1 edited

Legend:

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

    r25991 r26120  
    7272 */
    7373function ms_site_check() {
    74     global $wpdb, $current_site;
    75 
    7674    $blog = get_blog_details();
    7775
     
    102100            return WP_CONTENT_DIR . '/blog-inactive.php';
    103101        else
    104             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}" ) ) ) );
     102            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@' . get_current_site()->domain ) ) ) );
    105103    }
    106104
Note: See TracChangeset for help on using the changeset viewer.