WordPress.org

WordPress build repository browser

Changeset 41082


Ignore:
Timestamp:
08/12/17 13:11:43 (2 months ago)
Author:
flixos90
Message:

Multisite: Remove references to $wpdb->siteid and use get_current_network_id() instead.

Props sathyapulse, spacedmonkey.
Fixes #41507.

Built from https://develop.svn.wordpress.org/trunk@41242

Location:
trunk
Files:
7 edited

Legend:

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

    r41081 r41082  
    793793 * @since 3.1.0 
    794794 * 
    795  * @global wpdb $wpdb WordPress database abstraction object. 
    796  * 
    797795 * @param int $network_id The network ID to check. 
    798796 * @return bool True if network can be edited, otherwise false. 
    799797 */ 
    800798function can_edit_network( $network_id ) { 
    801     global $wpdb; 
    802  
    803     if ( $network_id == $wpdb->siteid ) 
     799    if ( $network_id == get_current_network_id() ) 
    804800        $result = true; 
    805801    else 
  • trunk/wp-includes/ms-blogs.php

    r41040 r41082  
    10921092        _deprecated_argument( __FUNCTION__, 'MU' ); // never used 
    10931093 
    1094     return $wpdb->get_results( $wpdb->prepare("SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' AND last_updated != '0000-00-00 00:00:00' ORDER BY last_updated DESC limit %d, %d", $wpdb->siteid, $start, $quantity ) , ARRAY_A ); 
     1094    return $wpdb->get_results( $wpdb->prepare( "SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' AND last_updated != '0000-00-00 00:00:00' ORDER BY last_updated DESC limit %d, %d", get_current_network_id(), $start, $quantity ), ARRAY_A ); 
    10951095} 
    10961096 
  • trunk/wp-includes/ms-deprecated.php

    r41081 r41082  
    188188 
    189189    global $wpdb; 
    190     $blogs = $wpdb->get_results( $wpdb->prepare("SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' ORDER BY registered DESC", $wpdb->siteid), ARRAY_A ); 
     190    $blogs = $wpdb->get_results( $wpdb->prepare( "SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' ORDER BY registered DESC", get_current_network_id() ), ARRAY_A ); 
    191191 
    192192    $blog_list = array(); 
     
    431431 
    432432    if ( ! $domain ) 
    433         $network_id = $wpdb->siteid; 
     433        $network_id = get_current_network_id(); 
    434434    else 
    435435        $network_id = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE domain = %s AND path = %s", $domain, $path ) ); 
     
    447447 * @deprecated 4.6.0 Use get_sites() 
    448448 * @see get_sites() 
    449  * 
    450  * @global wpdb $wpdb WordPress database abstraction object. 
    451449 * 
    452450 * @param array $args { 
     
    469467 */ 
    470468function wp_get_sites( $args = array() ) { 
    471     global $wpdb; 
    472  
    473469    _deprecated_function( __FUNCTION__, '4.6.0', 'get_sites()' ); 
    474470 
     
    477473 
    478474    $defaults = array( 
    479         'network_id' => $wpdb->siteid, 
     475        'network_id' => get_current_network_id(), 
    480476        'public'     => null, 
    481477        'archived'   => null, 
  • trunk/wp-includes/ms-functions.php

    r41081 r41082  
    7373        if ( is_array( $blogs ) && count( $blogs ) > 0 ) { 
    7474            foreach ( (array) $blogs as $blog_id => $blog ) { 
    75                 if ( $blog->site_id != $wpdb->siteid ) 
     75                if ( $blog->site_id != get_current_network_id() ) 
    7676                    continue; 
    7777                $details = get_site( $blog_id ); 
     
    10901090    } 
    10911091 
    1092     $blog_id = wpmu_create_blog( $signup->domain, $signup->path, $signup->title, $user_id, $meta, $wpdb->siteid ); 
     1092    $blog_id = wpmu_create_blog( $signup->domain, $signup->path, $signup->title, $user_id, $meta, get_current_network_id() ); 
    10931093 
    10941094    // TODO: What to do if we create a user but cannot create a blog? 
  • trunk/wp-includes/option.php

    r41081 r41082  
    224224 
    225225    if ( empty($network_id) ) 
    226         $network_id = $wpdb->siteid; 
     226        $network_id = get_current_network_id(); 
    227227 
    228228    $core_options = array('site_name', 'siteurl', 'active_sitewide_plugins', '_site_transient_timeout_theme_roots', '_site_transient_theme_roots', 'site_admins', 'can_compress_scripts', 'global_terms_enabled', 'ms_files_rewriting' ); 
  • trunk/wp-includes/version.php

    r41081 r41082  
    55 * @global string $wp_version 
    66 */ 
    7 $wp_version = '4.9-alpha-41241'; 
     7$wp_version = '4.9-alpha-41242'; 
    88 
    99/** 
  • trunk/wp-signup.php

    r41040 r41082  
    355355 */ 
    356356function validate_another_blog_signup() { 
    357     global $wpdb, $blogname, $blog_title, $errors, $domain, $path; 
     357    global $blogname, $blog_title, $errors, $domain, $path; 
    358358    $current_user = wp_get_current_user(); 
    359359    if ( ! is_user_logged_in() ) { 
     
    423423    $meta = apply_filters( 'add_signup_meta', $meta_defaults ); 
    424424 
    425     $blog_id = wpmu_create_blog( $domain, $path, $blog_title, $current_user->ID, $meta, $wpdb->siteid ); 
     425    $blog_id = wpmu_create_blog( $domain, $path, $blog_title, $current_user->ID, $meta, get_current_network_id() ); 
    426426 
    427427    if ( is_wp_error( $blog_id ) ) { 
Note: See TracChangeset for help on using the changeset viewer.