Ticket #37464: 37464.2.diff

src/wp-includes/class-wp-comment-query.php

@@ -393 +393 @@
 
                 // $args can include anything. Only use the args defined in the query_var_defaults to compute the key.
                 $key = md5( serialize( wp_array_slice_assoc( $this->query_vars, array_keys( $this->query_var_defaults ) ) ) );
-                $last_changed = wp_cache_get( 'last_changed', 'comment' );
-                if ( ! $last_changed ) {
-                        $last_changed = microtime();
-                        wp_cache_set( 'last_changed', $last_changed, 'comment' );
-                }
+                $last_changed = wp_cache_get_last_changed( 'comment' );
 
+
                 $cache_key   = "get_comments:$key:$last_changed";
                 $cache_value = wp_cache_get( $cache_key, 'comment' );
                 if ( false === $cache_value ) {
@@ -972 +969 @@
                 }
 
                 $key = md5( serialize( wp_array_slice_assoc( $this->query_vars, array_keys( $this->query_var_defaults ) ) ) );
-                $last_changed = wp_cache_get( 'last_changed', 'comment' );
-                if ( ! $last_changed ) {
-                        $last_changed = microtime();
-                        wp_cache_set( 'last_changed', $last_changed, 'comment' );
-                }
+                $last_changed = wp_cache_get_last_changed( 'comment' );
 
                 // Fetch an entire level of the descendant tree at a time.
                 $level = 0;

src/wp-includes/class-wp-network-query.php

@@ -209 +209 @@
 
                 // $args can include anything. Only use the args defined in the query_var_defaults to compute the key.
                 $key = md5( serialize( wp_array_slice_assoc( $this->query_vars, array_keys( $this->query_var_defaults ) ) ) );
-                $last_changed = wp_cache_get( 'last_changed', 'networks' );
-                if ( ! $last_changed ) {
-                        $last_changed = microtime();
-                        wp_cache_set( 'last_changed', $last_changed, 'networks' );
-                }
+                $last_changed = wp_cache_get_last_changed( 'networks' );
 
                 $cache_key = "get_network_ids:$key:$last_changed";
                 $cache_value = wp_cache_get( $cache_key, 'networks' );

src/wp-includes/class-wp-site-query.php

@@ -245 +245 @@
 
                 // $args can include anything. Only use the args defined in the query_var_defaults to compute the key.
                 $key = md5( serialize( wp_array_slice_assoc( $this->query_vars, array_keys( $this->query_var_defaults ) ) ) );
-                $last_changed = wp_cache_get( 'last_changed', 'sites' );
-                if ( ! $last_changed ) {
-                        $last_changed = microtime();
-                        wp_cache_set( 'last_changed', $last_changed, 'sites' );
-                }
+                $last_changed = wp_cache_get_last_changed( 'sites' );
 
                 $cache_key = "get_sites:$key:$last_changed";
                 $cache_value = wp_cache_get( $cache_key, 'sites' );

src/wp-includes/class-wp-term-query.php

@@ -673 +673 @@
 
                 // $args can be anything. Only use the args defined in defaults to compute the key.
                 $key = md5( serialize( wp_array_slice_assoc( $args, array_keys( $this->query_var_defaults ) ) ) . serialize( $taxonomies ) . $this->request );
-                $last_changed = wp_cache_get( 'last_changed', 'terms' );
-                if ( ! $last_changed ) {
-                        $last_changed = microtime();
-                        wp_cache_set( 'last_changed', $last_changed, 'terms' );
-                }
+                $last_changed = wp_cache_get_last_changed( 'terms' );
                 $cache_key = "get_terms:$key:$last_changed";
                 $cache = wp_cache_get( $cache_key, 'terms' );
                 if ( false !== $cache ) {

src/wp-includes/functions.php

@@ -5529 +5529 @@
 
         return false;
 }
+
+/**
+ * Get last changed date for the specified cache group.
+ *
+ * @since 4.7.0
+ *
+ * @param $group Where the cache contents are grouped.
+ *
+ * @return string $last_changed UNIX timestamp with microseconds representing when the group was last changed.
+ */
+function wp_cache_get_last_changed( $group ) {
+        $last_changed = wp_cache_get( 'last_changed', $group );
+
+        if ( ! $last_changed ) {
+                $last_changed = microtime();
+                wp_cache_set( 'last_changed', $last_changed, $group );
+        }
+
+        return $last_changed;
+}
+ No newline at end of file

src/wp-includes/general-template.php

@@ -1705 +1705 @@
 
         $output = '';
 
-        $last_changed = wp_cache_get( 'last_changed', 'posts' );
-        if ( ! $last_changed ) {
-                $last_changed = microtime();
-                wp_cache_set( 'last_changed', $last_changed, 'posts' );
-        }
+        $last_changed = wp_cache_get_last_changed( 'posts' );
 
         $limit = $r['limit'];
 

src/wp-includes/post.php

@@ -4111 +4111 @@
 function get_page_by_path( $page_path, $output = OBJECT, $post_type = 'page' ) {
         global $wpdb;
 
-        $last_changed = wp_cache_get( 'last_changed', 'posts' );
-        if ( false === $last_changed ) {
-                $last_changed = microtime();
-                wp_cache_set( 'last_changed', $last_changed, 'posts' );
-        }
+        $last_changed = wp_cache_get_last_changed( 'posts' );
 
         $hash = md5( $page_path . serialize( $post_type ) );
         $cache_key = "get_page_by_path:$hash:$last_changed";
@@ -4449 +4445 @@
 
         // $args can be whatever, only use the args defined in defaults to compute the key.
         $key = md5( serialize( wp_array_slice_assoc( $r, array_keys( $defaults ) ) ) );
-        $last_changed = wp_cache_get( 'last_changed', 'posts' );
-        if ( ! $last_changed ) {
-                $last_changed = microtime();
-                wp_cache_set( 'last_changed', $last_changed, 'posts' );
-        }
+        $last_changed = wp_cache_get_last_changed( 'posts' );
 
         $cache_key = "get_pages:$key:$last_changed";
         if ( $cache = wp_cache_get( $cache_key, 'posts' ) ) {