Changeset 41242 for trunk/src/wp-includes/ms-deprecated.php

Timestamp:

08/12/2017 01:10:24 PM (9 years ago)

Author:

flixos90

Message:

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

Props sathyapulse, spacedmonkey.
Fixes #41507.

File:

• trunk/src/wp-includes/ms-deprecated.php (modified) (5 diffs)

trunk/src/wp-includes/ms-deprecated.php

@@ -188 +188 @@
 
     global $wpdb;
-    $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 );
+    $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 );
 
     $blog_list = array();
@@ -431 +431 @@
 
     if ( ! $domain )
-        $network_id = $wpdb->siteid;
+        $network_id = get_current_network_id();
     else
         $network_id = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE domain = %s AND path = %s", $domain, $path ) );
@@ -447 +447 @@
  * @deprecated 4.6.0 Use get_sites()
  * @see get_sites()
- *
- * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param array $args {
@@ -469 +467 @@
  */
 function wp_get_sites( $args = array() ) {
-    global $wpdb;
-
     _deprecated_function( __FUNCTION__, '4.6.0', 'get_sites()' );
 
@@ -477 +473 @@
 
     $defaults = array(
-        'network_id' => $wpdb->siteid,
+        'network_id' => get_current_network_id(),
         'public'     => null,
         'archived'   => null,