Changeset 39694

Timestamp:

01/05/2017 08:14:56 AM (8 years ago)

Author:

dd32

Message:

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

Props dlh, westonruter.
See #35395.
Merges [39688] to the 4.7 branch.
Fixes #39259.

Location:

branches/4.7

Files:

• . (modified) (1 prop)
• src/wp-includes/theme.php (modified) (2 diffs)
• tests/phpunit/tests/customize/custom-css-setting.php (modified) (3 diffs)

branches/4.7/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 );
+            }
         }
     }

branches/4.7/tests/phpunit/tests/customize/custom-css-setting.php

@@ -136 +136 @@
         $twentyten_setting = new WP_Customize_Custom_CSS_Setting( $this->wp_customize, 'custom_css[twentyten]' );
 
+        remove_theme_mod( 'custom_css_post_id' );
+
         $this->assertEquals( $post_id, wp_get_custom_css_post()->ID );
         $this->assertEquals( $post_id, wp_get_custom_css_post( $this->setting->stylesheet )->ID );
@@ -222 +224 @@
 
     /**
+     * Test that wp_get_custom_css_post() doesn't query for a post after caching a failed lookup.
+     *
+     * @ticket 39259
+     */
+    function test_get_custom_css_post_queries_after_failed_lookup() {
+        set_theme_mod( 'custom_css_post_id', -1 );
+        $queries_before = get_num_queries();
+        wp_get_custom_css_post();
+        $this->assertSame( get_num_queries(), $queries_before );
+    }
+
+    /**
+     * Test that wp_update_custom_css_post() updates the 'custom_css_post_id' theme mod.
+     *
+     * @ticket 39259
+     */
+    function test_update_custom_css_updates_theme_mod() {
+        set_theme_mod( 'custom_css_post_id', -1 );
+        $post = wp_update_custom_css_post( 'body { background: blue; }' );
+        $this->assertSame( $post->ID, get_theme_mod( 'custom_css_post_id' ) );
+    }
+
+    /**
      * Test crud methods on WP_Customize_Custom_CSS_Setting.
      *
@@ -238 +263 @@
             'post_type' => 'custom_css',
         ) );
+        remove_theme_mod( 'custom_css_post_id' );
         $this->assertEquals( '/*custom*//*filtered*/', $this->setting->value() );