Changeset 26235
- Timestamp:
- 11/16/2013 01:45:28 PM (11 years ago)
- Location:
- trunk/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-admin/admin-header.php
r26134 r26235 13 13 // In case admin-header.php is included in a function. 14 14 global $title, $hook_suffix, $current_screen, $wp_locale, $pagenow, $wp_version, 15 $ current_site, $update_title, $total_update_count, $parent_file;15 $update_title, $total_update_count, $parent_file; 16 16 17 17 // Catch plugins that include admin-header.php before admin.php completes. … … 23 23 24 24 if ( is_network_admin() ) 25 $admin_title = sprintf( __( 'Network Admin: %s'), esc_html( $current_site->site_name ) );25 $admin_title = sprintf( __( 'Network Admin: %s' ), esc_html( get_current_site()->site_name ) ); 26 26 elseif ( is_user_admin() ) 27 $admin_title = sprintf( __( 'Global Dashboard: %s'), esc_html( $current_site->site_name ) );27 $admin_title = sprintf( __( 'Global Dashboard: %s' ), esc_html( get_current_site()->site_name ) ); 28 28 else 29 29 $admin_title = get_bloginfo( 'name' ); -
trunk/src/wp-includes/functions.php
r26191 r26235 3346 3346 */ 3347 3347 function is_main_network( $network_id = null ) { 3348 global $ current_site, $wpdb;3348 global $wpdb; 3349 3349 3350 3350 if ( ! is_multisite() ) 3351 3351 return true; 3352 3352 3353 $current_network_id = (int) $current_site->id;3353 $current_network_id = (int) get_current_site()->id; 3354 3354 3355 3355 if ( ! $network_id )
Note: See TracChangeset
for help on using the changeset viewer.