Changeset 38925 for trunk/src/wp-includes/post.php

Timestamp:

10/25/2016 08:47:06 PM (10 years ago)

Author:

rachelbaker

Message:

Feeds: Always return a valid timestamp for the Last-Modified header of comment or post feeds.

Fixes bug where an invalid Last-Modified value would be returned in feed requests for sites that had 0 items to return. Comment or post feeds will now return the current timestamp as the Last-Modified header value. Example: a request for the comments feed for a site without any comments.

Replaced use of the local static variable $cache_lastcommentmodified to store the modified date in get_lastcommentmodified() with the Object Cache API. The get_lastcommentmodified() function returns early if there is a cached value and returns false if there where no comments found. Introduced _clear_modified_cache_on_transition_comment_status() to flush the lastcommentmodified cache key when a comment enters or leaves approval status. In get_lastpostmodified() return early if there is a cached value and return false if there are no posts found.

Props swissspidy, rachelbaker, dllh, leobaiano.
Fixes #38027.

File:

• trunk/src/wp-includes/post.php (modified) (1 diff)

trunk/src/wp-includes/post.php

@@ -5613 +5613 @@
 
         $date = wp_cache_get( $key, 'timeinfo' );
-
-        if ( ! $date ) {
-                if ( 'any' === $post_type ) {
-                        $post_types = get_post_types( array( 'public' => true ) );
-                        array_walk( $post_types, array( $wpdb, 'escape_by_ref' ) );
-                        $post_types = "'" . implode( "', '", $post_types ) . "'";
-                } else {
-                        $post_types = "'" . sanitize_key( $post_type ) . "'";
-                }
-
-                switch ( $timezone ) {
-                        case 'gmt':
-                                $date = $wpdb->get_var("SELECT post_{$field}_gmt FROM $wpdb->posts WHERE post_status = 'publish' AND post_type IN ({$post_types}) ORDER BY post_{$field}_gmt DESC LIMIT 1");
-                                break;
-                        case 'blog':
-                                $date = $wpdb->get_var("SELECT post_{$field} FROM $wpdb->posts WHERE post_status = 'publish' AND post_type IN ({$post_types}) ORDER BY post_{$field}_gmt DESC LIMIT 1");
-                                break;
-                        case 'server':
-                                $add_seconds_server = date( 'Z' );
-                                $date = $wpdb->get_var("SELECT DATE_ADD(post_{$field}_gmt, INTERVAL '$add_seconds_server' SECOND) FROM $wpdb->posts WHERE post_status = 'publish' AND post_type IN ({$post_types}) ORDER BY post_{$field}_gmt DESC LIMIT 1");
-                                break;
-                }
-
-                if ( $date ) {
-                        wp_cache_set( $key, $date, 'timeinfo' );
-                }
-        }
-
-        return $date;
+        if ( false !== $date ) {
+                return $date;
+        }
+
+        if ( 'any' === $post_type ) {
+                $post_types = get_post_types( array( 'public' => true ) );
+                array_walk( $post_types, array( $wpdb, 'escape_by_ref' ) );
+                $post_types = "'" . implode( "', '", $post_types ) . "'";
+        } else {
+                $post_types = "'" . sanitize_key( $post_type ) . "'";
+        }
+
+        switch ( $timezone ) {
+                case 'gmt':
+                        $date = $wpdb->get_var("SELECT post_{$field}_gmt FROM $wpdb->posts WHERE post_status = 'publish' AND post_type IN ({$post_types}) ORDER BY post_{$field}_gmt DESC LIMIT 1");
+                        break;
+                case 'blog':
+                        $date = $wpdb->get_var("SELECT post_{$field} FROM $wpdb->posts WHERE post_status = 'publish' AND post_type IN ({$post_types}) ORDER BY post_{$field}_gmt DESC LIMIT 1");
+                        break;
+                case 'server':
+                        $add_seconds_server = date( 'Z' );
+                        $date = $wpdb->get_var("SELECT DATE_ADD(post_{$field}_gmt, INTERVAL '$add_seconds_server' SECOND) FROM $wpdb->posts WHERE post_status = 'publish' AND post_type IN ({$post_types}) ORDER BY post_{$field}_gmt DESC LIMIT 1");
+                        break;
+        }
+
+        if ( $date ) {
+                wp_cache_set( $key, $date, 'timeinfo' );
+
+                return $date;
+        }
+
+        return false;
 }