From d93d3febfe5cc277ee0c624131f5d10ae4095535 Mon Sep 17 00:00:00 2001
From: Dion Hulse <wordpress@dd32.id.au>
Date: Thu, 5 Jan 2017 08:13:35 +0000
Subject: [PATCH] Customizer: Don't query for postmeta for Custom CSS (for
 not-current-themes) and Customizer Changeset posts.

Props dlh.
Merges [39692] to the 4.7 branch.
Fixes #39194.

Built from https://develop.svn.wordpress.org/branches/4.7@39693


git-svn-id: http://core.svn.wordpress.org/branches/4.7@39633 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp-customize-manager.php | 3 ++-
 wp-includes/theme.php                      | 3 ++-
 wp-includes/version.php                    | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/wp-includes/class-wp-customize-manager.php b/wp-includes/class-wp-customize-manager.php
index 4ac25232ff..f80708a23f 100644
--- a/wp-includes/class-wp-customize-manager.php
+++ b/wp-includes/class-wp-customize-manager.php
@@ -798,7 +798,8 @@ final class WP_Customize_Manager {
 			'no_found_rows' => true,
 			'cache_results' => true,
 			'update_post_meta_cache' => false,
-			'update_term_meta_cache' => false,
+			'update_post_term_cache' => false,
+			'lazy_load_term_meta' => false,
 		) );
 		if ( ! empty( $changeset_post_query->posts ) ) {
 			// Note: 'fields'=>'ids' is not being used in order to cache the post object as it will be needed.
diff --git a/wp-includes/theme.php b/wp-includes/theme.php
index da1cb12ce9..9cc38db8a3 100644
--- a/wp-includes/theme.php
+++ b/wp-includes/theme.php
@@ -1643,7 +1643,8 @@ function wp_get_custom_css_post( $stylesheet = '' ) {
 		'no_found_rows'          => true,
 		'cache_results'          => true,
 		'update_post_meta_cache' => false,
-		'update_term_meta_cache' => false,
+		'update_post_term_cache' => false,
+		'lazy_load_term_meta'    => false,
 	);
 
 	$post = null;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 3d50ae01eb..92ba81d47f 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7.1-alpha-39690';
+$wp_version = '4.7.1-alpha-39693';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.