Changeset 39338

Timestamp:

11/22/16 11:40:22 (9 months ago)

Author:

peterwilsoncc

Message:

Themes: Prevent unneeded database updates in wp_get_custom_css_post().

When a custom header image was set but custom CSS was not, wp_get_custom_css_post() was generating an UPDATE query on every frontend request.

In theme options the header image meta data is stored as an object. In update_option() this hits an edge case as the resource IDs of the old and new values never match.

This changes the logic of wp_get_custom_css_post() to ensure set_theme_mod() is only called when the custom CSS has changed.

Props bradyvercher, helen.
Fixes #38866.

File:

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

trunk/src/wp-includes/theme.php

@@ -1640 +1640 @@
         'post_status'            => get_post_stati(),
         'name'                   => sanitize_title( $stylesheet ),
-        'number'                 => 1,
+        'posts_per_page'         => 1,
         'no_found_rows'          => true,
         'cache_results'          => true,
@@ -1650 +1650 @@
     if ( get_stylesheet() === $stylesheet ) {
         $post_id = get_theme_mod( 'custom_css_post_id' );
-        if ( ! $post_id || ! get_post( $post_id ) ) {
+
+        if ( $post_id > 0 && get_post( $post_id ) ) {
+            $post = get_post( $post_id );
+        } else {
             $query = new WP_Query( $custom_css_query_vars );
             $post = $query->post;
@@ -1657 +1660 @@
              * @todo This should get cleared if a custom_css post is added/removed.
              */
-            set_theme_mod( 'custom_css_post_id', $post ? $post->ID : -1 );
-        } elseif ( $post_id > 0 ) {
-            $post = get_post( $post_id );
+            if ( $post ) {
+                set_theme_mod( 'custom_css_post_id', $post->ID );
+            } elseif ( -1 !== $post_id ) {
+                set_theme_mod( 'custom_css_post_id', -1 );
+            }
         }
     } else {