WordPress.org

Make WordPress Core


Ignore:
Timestamp:
10/19/2016 04:46:14 AM (3 years ago)
Author:
jeremyfelt
Message:

Multisite: Use get_network() and get_current_network_id() for current network data.

get_network() falls back to the current network when called without any arguments. Between this and get_current_network_id(), we can replace almost all instances of the global $current_site and all instances of get_current_site().

This effectively deprecates get_current_site(), something that we'll do in a future ticket.

Props flixos90.
Fixes #37414.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/admin-bar.php

    r38810 r38814  
    313313    if ( is_network_admin() ) {
    314314        /* translators: %s: site name */
    315         $blogname = sprintf( __( 'Network Admin: %s' ), esc_html( get_current_site()->site_name ) );
     315        $blogname = sprintf( __( 'Network Admin: %s' ), esc_html( get_network()->site_name ) );
    316316    } elseif ( is_user_admin() ) {
    317317        /* translators: %s: site name */
    318         $blogname = sprintf( __( 'User Dashboard: %s' ), esc_html( get_current_site()->site_name ) );
     318        $blogname = sprintf( __( 'User Dashboard: %s' ), esc_html( get_network()->site_name ) );
    319319    }
    320320
Note: See TracChangeset for help on using the changeset viewer.