From 7b5cd0c021775950c1bf8c23508b278a02ac0be4 Mon Sep 17 00:00:00 2001
From: Jeremy Felt <jeremy.felt@gmail.com>
Date: Thu, 7 Jul 2016 15:52:28 +0000
Subject: [PATCH] Multisite: Don't store `max_num_pages` in `WP_Network_Query`
 query cache.

This value can be easily calculated with available data.

Props spacedmonkey.
Fixes #32504.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37944 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp-network-query.php | 7 ++++---
 wp-includes/version.php                | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/wp-includes/class-wp-network-query.php b/wp-includes/class-wp-network-query.php
index ec4d97cd4d..9390657894 100644
--- a/wp-includes/class-wp-network-query.php
+++ b/wp-includes/class-wp-network-query.php
@@ -229,13 +229,15 @@ class WP_Network_Query {
 			$cache_value = array(
 				'network_ids' => $network_ids,
 				'found_networks' => $this->found_networks,
-				'max_num_pages' => $this->max_num_pages,
 			);
 			wp_cache_add( $cache_key, $cache_value, 'networks' );
 		} else {
 			$network_ids = $cache_value['network_ids'];
 			$this->found_networks = $cache_value['found_networks'];
-			$this->max_num_pages = $cache_value['max_num_pages'];
+		}
+
+		if ( $this->found_networks && $this->query_vars['number'] ) {
+			$this->max_num_pages = ceil( $this->found_networks / $this->query_vars['number'] );
 		}
 
 		// If querying for a count only, there's nothing more to do.
@@ -477,7 +479,6 @@ class WP_Network_Query {
 			$found_networks_query = apply_filters( 'found_networks_query', 'SELECT FOUND_ROWS()', $this );
 
 			$this->found_networks = (int) $wpdb->get_var( $found_networks_query );
-			$this->max_num_pages = ceil( $this->found_networks / $this->query_vars['number'] );
 		}
 	}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 6389a80ff7..b463a78e30 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.6-beta2-38002';
+$wp_version = '4.6-beta2-38003';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.