Changeset 37620

Timestamp:

06/02/2016 02:25:56 AM (8 years ago)

Author:

jeremyfelt

Message:

Multisite: Replace $wpdb->blog queries in ms-functions.php with get_sites()

get_sites() is now used in:

• domain_exists()
• wp_update_network_site_counts()
• get_blog_id_from_url()

Props spacedmonkey, jeremyfelt.
See #35791.

File:

• trunk/src/wp-includes/ms-functions.php (modified) (7 diffs)

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

@@ -297 +297 @@
  *
  * @since MU 2.6.5
+ * @since 4.6.0 Converted to use get_sites()
  *
  * @global wpdb $wpdb WordPress database abstraction object.
@@ -305 +306 @@
  */
 function get_blog_id_from_url( $domain, $path = '/' ) {
-    global $wpdb;
-
     $domain = strtolower( $domain );
     $path = strtolower( $path );
@@ -316 +315 @@
         return (int) $id;
 
-    $id = $wpdb->get_var( $wpdb->prepare( "SELECT blog_id FROM $wpdb->blogs WHERE domain = %s and path = %s /* get_blog_id_from_url */", $domain, $path ) );
+    $args = array(
+        'domain' => $domain,
+        'path' => $path,
+        'fields' => 'ids',
+    );
+    $result = get_sites( $args );
+    $id = array_shift( $result );
 
     if ( ! $id ) {
@@ -1248 +1253 @@
  *
  * @since MU
+ * @since 4.6.0 Converted to use get_sites()
  *
  * @global wpdb $wpdb WordPress database abstraction object.
@@ -1257 +1263 @@
  */
 function domain_exists($domain, $path, $site_id = 1) {
-    global $wpdb;
     $path = trailingslashit( $path );
-    $result = $wpdb->get_var( $wpdb->prepare("SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s AND site_id = %d", $domain, $path, $site_id) );
+    $args = array(
+        'network_id' => $site_id,
+        'domain' => $domain,
+        'path' => $path,
+        'fields' => 'ids',
+    );
+    $result = get_sites( $args );
+    $result = array_shift( $result );
 
     /**
@@ -2248 +2260 @@
  *
  * @since 3.7.0
+ * @since 4.6.0 Converted to use get_sites()
  *
  * @global wpdb $wpdb WordPress database abstraction object.
@@ -2254 +2267 @@
     global $wpdb;
 
-    $count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(blog_id) as c FROM $wpdb->blogs WHERE site_id = %d AND spam = '0' AND deleted = '0' and archived = '0'", $wpdb->siteid) );
+    $count = get_sites( array(
+        'network_id' => $wpdb->siteid,
+        'spam'       => 0,
+        'deleted'    => 0,
+        'archived'   => 0,
+        'count'      => true,
+    ) );
+
     update_site_option( 'blog_count', $count );
 }