Changeset 36259

Timestamp:

01/11/2016 05:05:09 AM (10 years ago)

Author:

dd32

Message:

Multisite: The networks group should be global.

Merges [36258] to the 4.4 branch.
Fixes #35251.

Location:

branches/4.4

Files:

• . (modified) (1 prop)
• src/wp-includes/load.php (modified) (1 diff)
• src/wp-includes/ms-blogs.php (modified) (1 diff)

branches/4.4/src/wp-includes/load.php

@@ -474 +474 @@
 
     if ( function_exists( 'wp_cache_add_global_groups' ) ) {
-        wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache' ) );
+        wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks' ) );
         wp_cache_add_non_persistent_groups( array( 'comment', 'counts', 'plugins' ) );
     }

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

@@ -655 +655 @@
                 wp_cache_add_global_groups( $global_groups );
             } else {
-                wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache' ) );
+                wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks' ) );
             }
             wp_cache_add_non_persistent_groups( array( 'comment', 'counts', 'plugins' ) );