Changeset 39688 for trunk/src/wp-includes/theme.php

Timestamp:

01/05/2017 07:12:23 AM (10 years ago)

Author:

westonruter

Message:

Customize: Ensure theme_mod-cache of custom_css lookup of -1 short-circuits a WP_Query from being made.

Props dlh.
See #35395.
Fixes #39259.

File:

• trunk/src/wp-includes/theme.php (modified) (2 diffs)

trunk/src/wp-includes/theme.php

@@ -1654 +1654 @@
                 if ( $post_id > 0 && get_post( $post_id ) ) {
                         $post = get_post( $post_id );
-                } else {
+                }
+
+                // `-1` indicates no post exists; no query necessary.
+                if ( ! $post && -1 !== $post_id ) {
                         $query = new WP_Query( $custom_css_query_vars );
                         $post = $query->post;
                         /*
-                         * Cache the lookup. See WP_Customize_Custom_CSS_Setting::update().
+                         * Cache the lookup. See wp_update_custom_css_post().
                          * @todo This should get cleared if a custom_css post is added/removed.
                          */
-                        if ( $post ) {
-                                set_theme_mod( 'custom_css_post_id', $post->ID );
-                        } elseif ( -1 !== $post_id ) {
-                                set_theme_mod( 'custom_css_post_id', -1 );
-                        }
+                        set_theme_mod( 'custom_css_post_id', $post ? $post->ID : -1 );
                 }
         } else {
@@ -1789 +1788 @@
                 $r = wp_insert_post( wp_slash( $post_data ), true );
 
-                // Trigger creation of a revision. This should be removed once #30854 is resolved.
-                if ( ! is_wp_error( $r ) && 0 === count( wp_get_post_revisions( $r ) ) ) {
-                        wp_save_post_revision( $r );
+                if ( ! is_wp_error( $r ) ) {
+                        if ( get_stylesheet() === $args['stylesheet'] ) {
+                                set_theme_mod( 'custom_css_post_id', $r );
+                        }
+
+                        // Trigger creation of a revision. This should be removed once #30854 is resolved.
+                        if ( 0 === count( wp_get_post_revisions( $r ) ) ) {
+                                wp_save_post_revision( $r );
+                        }
                 }
         }