From ad80e08c17491c870fc834ef382303dc7ac3cd63 Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Wed, 9 Nov 2016 20:43:30 +0000
Subject: [PATCH] Customize: Split out `custom_css` query logic from
 `wp_get_custom_css()` into a re-usable `wp_get_custom_css_post()` function to
 also be used when updating.

Props georgestephanis, westonruter.
See #38672, #35395.

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


git-svn-id: http://core.svn.wordpress.org/trunk@39125 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 .../class-wp-customize-custom-css-setting.php | 17 ++-----
 wp-includes/theme.php                         | 47 ++++++++++++-------
 wp-includes/version.php                       |  2 +-
 3 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/wp-includes/customize/class-wp-customize-custom-css-setting.php b/wp-includes/customize/class-wp-customize-custom-css-setting.php
index 034e081484..ba4a58cf01 100644
--- a/wp-includes/customize/class-wp-customize-custom-css-setting.php
+++ b/wp-includes/customize/class-wp-customize-custom-css-setting.php
@@ -236,20 +236,9 @@ final class WP_Customize_Custom_CSS_Setting extends WP_Customize_Setting {
 		);
 
 		// Update post if it already exists, otherwise create a new one.
-		$post_id = null;
-		$query = new WP_Query( array(
-			'post_type' => 'custom_css',
-			'post_status' => get_post_stati(),
-			'name' => sanitize_title( $this->stylesheet ),
-			'number' => 1,
-			'no_found_rows' => true,
-			'cache_results' => true,
-			'update_post_meta_cache' => false,
-			'update_term_meta_cache' => false,
-			'suppress_filters' => true,
-		) );
-		if ( ! empty( $query->post ) ) {
-			$args['ID'] = $query->post->ID;
+		$post = wp_get_custom_css_post( $this->stylesheet );
+		if ( $post ) {
+			$args['ID'] = $post->ID;
 			$post_id = wp_update_post( wp_slash( $args ) );
 		} else {
 			$post_id = wp_insert_post( wp_slash( $args ) );
diff --git a/wp-includes/theme.php b/wp-includes/theme.php
index 646b2e4553..baad12f52d 100644
--- a/wp-includes/theme.php
+++ b/wp-includes/theme.php
@@ -1574,32 +1574,26 @@ function wp_custom_css_cb() {
 }
 
 /**
- * Fetch the saved Custom CSS content.
- *
- * Gets the content of a Custom CSS post that matches the
- * current theme.
+ * Fetch the `custom_css` post for a given theme.
  *
  * @since 4.7.0
  * @access public
  *
  * @param string $stylesheet Optional. A theme object stylesheet name. Defaults to the current theme.
- *
- * @return string The Custom CSS Post content.
+ * @return WP_Post|null The custom_css post or null if none exists.
  */
-function wp_get_custom_css( $stylesheet = '' ) {
-	$css = '';
-
+function wp_get_custom_css_post( $stylesheet = '' ) {
 	if ( empty( $stylesheet ) ) {
 		$stylesheet = get_stylesheet();
 	}
 
 	$custom_css_query_vars = array(
-		'post_type' => 'custom_css',
-		'post_status' => get_post_stati(),
-		'name' => sanitize_title( $stylesheet ),
-		'number' => 1,
-		'no_found_rows' => true,
-		'cache_results' => true,
+		'post_type'              => 'custom_css',
+		'post_status'            => get_post_stati(),
+		'name'                   => sanitize_title( $stylesheet ),
+		'number'                 => 1,
+		'no_found_rows'          => true,
+		'cache_results'          => true,
 		'update_post_meta_cache' => false,
 		'update_term_meta_cache' => false,
 	);
@@ -1607,10 +1601,9 @@ function wp_get_custom_css( $stylesheet = '' ) {
 	$post = null;
 	if ( get_stylesheet() === $stylesheet ) {
 		$post_id = get_theme_mod( 'custom_css_post_id' );
-		if ( ! $post_id ) {
+		if ( ! $post_id || ! get_post( $post_id ) ) {
 			$query = new WP_Query( $custom_css_query_vars );
 			$post = $query->post;
-
 			/*
 			 * Cache the lookup. See WP_Customize_Custom_CSS_Setting::update().
 			 * @todo This should get cleared if a custom_css post is added/removed.
@@ -1624,6 +1617,26 @@ function wp_get_custom_css( $stylesheet = '' ) {
 		$post = $query->post;
 	}
 
+	return $post;
+}
+
+/**
+ * Fetch the saved Custom CSS content.
+ *
+ * @since 4.7.0
+ * @access public
+ *
+ * @param string $stylesheet Optional. A theme object stylesheet name. Defaults to the current theme.
+ * @return string The Custom CSS Post content.
+ */
+function wp_get_custom_css( $stylesheet = '' ) {
+	$css = '';
+
+	if ( empty( $stylesheet ) ) {
+		$stylesheet = get_stylesheet();
+	}
+
+	$post = wp_get_custom_css_post( $stylesheet );
 	if ( $post ) {
 		$css = $post->post_content;
 	}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 721ec6c182..6766cb1676 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-beta2-39184';
+$wp_version = '4.7-beta2-39185';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.