Context Navigation

← Previous Change
Next Change →

comment.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:

: 1 edited

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

Legend:

: Unmodified
: Added
: Removed

trunk/src/wp-includes/comment.php

-              r38852
+              r38925
+ *
  * @since 1.5.0
+ * @since 4.7.0 Replaced caching the modified date in a local static variable
+ *              with the Object Cache API.
+ *
  * @global wpdb $wpdb WordPress database abstraction object.
+ * @staticvar array $cache_lastcommentmodified
+ *
+ * @param string $timezone Which timezone to use in reference to 'gmt', 'blog',
+ *              or 'server' locations.
+ * @return string Last comment modified date.
+ */
+function get_lastcommentmodified($timezone = 'server') {
+ *
+ * @param string $timezone Which timezone to use in reference to 'gmt', 'blog', or 'server' locations.
+ * @return string|false Last comment modified date on success, false on failure.
+ */
+function get_lastcommentmodified( $timezone = 'server' ) {
         global $wpdb;
+        static $cache_lastcommentmodified = array();
+        if ( isset($cache_lastcommentmodified[$timezone]) )
+                return $cache_lastcommentmodified[$timezone];
+        $add_seconds_server = date('Z');
+        switch ( strtolower($timezone)) {
+        $timezone = strtolower( $timezone );
+        $key = "lastcommentmodified:$timezone";
+        $comment_modified_date = wp_cache_get( $key, 'timeinfo' );
+        if ( false !== $comment_modified_date ) {
+                return $comment_modified_date;
+        }
+        switch ( $timezone ) {
                 case 'gmt':
                         $lastcommentmodified = $wpdb->get_var("SELECT comment_date_gmt FROM $wpdb->comments WHERE comment_approved = '1' ORDER BY comment_date_gmt DESC LIMIT 1");
+                        $comment_modified_date = $wpdb->get_var( "SELECT comment_date_gmt FROM $wpdb->comments WHERE comment_approved = '1' ORDER BY comment_date_gmt DESC LIMIT 1" );
                         break;
                 case 'blog':
                         $lastcommentmodified = $wpdb->get_var("SELECT comment_date FROM $wpdb->comments WHERE comment_approved = '1' ORDER BY comment_date_gmt DESC LIMIT 1");
+                        $comment_modified_date = $wpdb->get_var( "SELECT comment_date FROM $wpdb->comments WHERE comment_approved = '1' ORDER BY comment_date_gmt DESC LIMIT 1" );
                         break;
                 case 'server':
+                        $lastcommentmodified = $wpdb->get_var($wpdb->prepare("SELECT DATE_ADD(comment_date_gmt, INTERVAL %s SECOND) FROM $wpdb->comments WHERE comment_approved = '1' ORDER BY comment_date_gmt DESC LIMIT 1", $add_seconds_server));
+                        $add_seconds_server = date( 'Z' );
+                        $comment_modified_date = $wpdb->get_var( $wpdb->prepare( "SELECT DATE_ADD(comment_date_gmt, INTERVAL %s SECOND) FROM $wpdb->comments WHERE comment_approved = '1' ORDER BY comment_date_gmt DESC LIMIT 1", $add_seconds_server ) );
                         break;
+        }
+        $cache_lastcommentmodified[$timezone] = $lastcommentmodified;
+        return $lastcommentmodified;
+        if ( $comment_modified_date ) {
+                wp_cache_set( $key, $comment_modified_date, 'timeinfo' );
+                return $comment_modified_date;
+        }
+        return false;
+}
 …
 /**
+ * Clear the lastcommentmodified cached value when a comment status is changed.
+ *
+ * Deletes the lastcommentmodified cache key when a comment enters or leaves
+ * 'approved' status.
+ *
+ * @since 4.7.0
+ * @access private
+ *
+ * @param string $new_status The new comment status.
+ * @param string $old_status The old comment status.
+ */
+function _clear_modified_cache_on_transition_comment_status( $new_status, $old_status ) {
+        if ( 'approved' === $new_status || 'approved' === $old_status ) {
+                foreach ( array( 'server', 'gmt', 'blog' ) as $timezone ) {
+                        wp_cache_delete( "lastcommentmodified:$timezone", 'timeinfo' );
+                }
+        }
+}
+/**
  * Get current commenter's name, email, and URL.
+ *
 …
         if ( $comment_approved == 1 ) {
                 wp_update_comment_count( $comment_post_ID );
+                foreach ( array( 'server', 'gmt', 'blog' ) as $timezone ) {
+                        wp_cache_delete( "lastcommentmodified:$timezone", 'timeinfo' );
+                }
+        }

Note: See TracChangeset for help on using the changeset viewer.

Make WordPress Core

Context Navigation

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

Legend:

trunk/src/wp-includes/comment.php

Download in other formats: