Changeset 44928 for branches/5.1

Timestamp:

03/18/2019 04:20:53 PM (7 years ago)

Author:

flixos90

Message:

Multisite: Do not prime site meta caches unless necessary.

Merges [44926] to the 5.1 branch.

Props spacedmonkey.
Fixes #46357. See #46167.

Location:

branches/5.1

Files:

• . (modified) (1 prop)
• src/wp-admin/network/upgrade.php (modified) (1 diff)
• src/wp-includes/embed.php (modified) (1 diff)
• src/wp-includes/ms-blogs.php (modified) (1 diff)
• src/wp-includes/ms-functions.php (modified) (3 diffs)
• src/wp-includes/ms-load.php (modified) (1 diff)
• src/wp-includes/user.php (modified) (1 diff)

branches/5.1/src/wp-admin/network/upgrade.php

@@ -58 +58 @@
                 $site_ids = get_sites(
                         array(
-                                'spam'       => 0,
-                                'deleted'    => 0,
-                                'archived'   => 0,
-                                'network_id' => get_current_network_id(),
-                                'number'     => 5,
-                                'offset'     => $n,
-                                'fields'     => 'ids',
-                                'order'      => 'DESC',
-                                'orderby'    => 'id',
+                                'spam'                   => 0,
+                                'deleted'                => 0,
+                                'archived'               => 0,
+                                'network_id'             => get_current_network_id(),
+                                'number'                 => 5,
+                                'offset'                 => $n,
+                                'fields'                 => 'ids',
+                                'order'                  => 'DESC',
+                                'orderby'                => 'id',
+                                'update_site_meta_cache' => false,
                         )
                 );

branches/5.1/src/wp-includes/embed.php

@@ -587 +587 @@
 
                 $qv = array(
-                        'domain' => $url_parts['host'],
-                        'path'   => '/',
+                        'domain'                 => $url_parts['host'],
+                        'path'                   => '/',
+                        'update_site_meta_cache' => false,
                 );
 

branches/5.1/src/wp-includes/ms-blogs.php

@@ -98 +98 @@
         $site_ids = get_sites(
                 array(
-                        'number' => 1,
-                        'fields' => 'ids',
-                        'domain' => $domain,
-                        'path'   => $path,
+                        'number'                 => 1,
+                        'fields'                 => 'ids',
+                        'domain'                 => $domain,
+                        'path'                   => $path,
+                        'update_site_meta_cache' => false,
                 )
         );

branches/5.1/src/wp-includes/ms-functions.php

@@ -346 +346 @@
 
         $args   = array(
-                'domain' => $domain,
-                'path'   => $path,
-                'fields' => 'ids',
-                'number' => 1,
+                'domain'                 => $domain,
+                'path'                   => $path,
+                'fields'                 => 'ids',
+                'number'                 => 1,
+                'update_site_meta_cache' => false,
         );
         $result = get_sites( $args );
@@ -1474 +1475 @@
         $path   = trailingslashit( $path );
         $args   = array(
-                'network_id' => $network_id,
-                'domain'     => $domain,
-                'path'       => $path,
-                'fields'     => 'ids',
-                'number'     => 1,
+                'network_id'             => $network_id,
+                'domain'                 => $domain,
+                'path'                   => $path,
+                'fields'                 => 'ids',
+                'number'                 => 1,
+                'update_site_meta_cache' => false,
         );
         $result = get_sites( $args );
@@ -2434 +2436 @@
         $count = get_sites(
                 array(
-                        'network_id' => $network_id,
-                        'spam'       => 0,
-                        'deleted'    => 0,
-                        'archived'   => 0,
-                        'count'      => true,
+                        'network_id'             => $network_id,
+                        'spam'                   => 0,
+                        'deleted'                => 0,
+                        'archived'               => 0,
+                        'count'                  => true,
+                        'update_site_meta_cache' => false,
                 )
         );

branches/5.1/src/wp-includes/ms-load.php

@@ -236 +236 @@
 
         $args = array(
-                'number' => 1,
+                'number'                 => 1,
+                'update_site_meta_cache' => false,
         );
 

branches/5.1/src/wp-includes/user.php

@@ -681 +681 @@
         if ( ! empty( $site_ids ) ) {
                 $args = array(
-                        'number'   => '',
-                        'site__in' => $site_ids,
+                        'number'                 => '',
+                        'site__in'               => $site_ids,
+                        'update_site_meta_cache' => false,
                 );
                 if ( ! $all ) {