WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Jeremy Felt 2016-07-07 15:52:28 +00:00
parent d11c9de613
commit 7b5cd0c021
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wp-includes/class-wp-network-query.php
View File

@ -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'] );
}
}

2
wp-includes/version.php
View File

@ -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.