Changeset 23401

Timestamp:

02/11/2013 06:08:14 PM (14 years ago)

Author:

ryan

Message:

Use microtime() instead of incrementors for last_changed to to avoid race conditions with cache evictions.

Props westi
fixes #23448

Location:

trunk/wp-includes

Files:

• comment.php (modified) (3 diffs)
• general-template.php (modified) (1 diff)
• post.php (modified) (2 diffs)
• taxonomy.php (modified) (2 diffs)

trunk/wp-includes/comment.php

@@ -252 +252 @@
                 $last_changed = wp_cache_get( 'last_changed', 'comment' );
                 if ( ! $last_changed ) {
-                        $last_changed = 1;
+                        $last_changed = microtime();
                         wp_cache_set( 'last_changed', $last_changed, 'comment' );
                 }
@@ -1293 +1293 @@
         do_action('wp_insert_comment', $id, $comment);
 
-        if ( function_exists( 'wp_cache_incr' ) ) {
-                wp_cache_incr( 'last_changed', 1, 'comment' );
-        } else {
-                $last_changed = wp_cache_get( 'last_changed', 'comment' );
-                wp_cache_set( 'last_changed', $last_changed + 1, 'comment' );
-        }
+        wp_cache_set( 'last_changed', microtime(), 'comment' );
 
         return $id;
@@ -2051 +2046 @@
                 wp_cache_delete($id, 'comment');
 
-        if ( function_exists( 'wp_cache_incr' ) ) {
-                wp_cache_incr( 'last_changed', 1, 'comment' );
-        } else {
-                $last_changed = wp_cache_get( 'last_changed', 'comment' );
-                wp_cache_set( 'last_changed', $last_changed + 1, 'comment' );
-        }
+        wp_cache_set( 'last_changed', microtime(), 'comment' );
 }
 

trunk/wp-includes/general-template.php

@@ -920 +920 @@
         $last_changed = wp_cache_get( 'last_changed', 'posts' );
         if ( ! $last_changed ) {
-                $last_changed = 1;
+                $last_changed = microtime();
                 wp_cache_set( 'last_changed', $last_changed, 'posts' );
         }

trunk/wp-includes/post.php

@@ -3654 +3654 @@
         $last_changed = wp_cache_get( 'last_changed', 'posts' );
         if ( ! $last_changed ) {
-                $last_changed = 1;
+                $last_changed = microtime();
                 wp_cache_set( 'last_changed', $last_changed, 'posts' );
         }
@@ -4673 +4673 @@
         }
 
-        if ( function_exists( 'wp_cache_incr' ) ) {
-                wp_cache_incr( 'last_changed', 1, 'posts' );
-        } else {
-                $last_changed = wp_cache_get( 'last_changed', 'posts' );
-                wp_cache_set( 'last_changed', $last_changed + 1, 'posts' );
-        }
+        wp_cache_set( 'last_changed', microtime(), 'posts' );
 }
 

trunk/wp-includes/taxonomy.php

@@ -1243 +1243 @@
         $last_changed = wp_cache_get( 'last_changed', 'terms' );
         if ( ! $last_changed ) {
-                $last_changed = 1;
+                $last_changed = microtime();
                 wp_cache_set( 'last_changed', $last_changed, 'terms' );
         }
@@ -2712 +2712 @@
         }
 
-        if ( function_exists( 'wp_cache_incr' ) ) {
-                wp_cache_incr( 'last_changed', 1, 'terms' );
-        } else {
-                $last_changed = wp_cache_get( 'last_changed', 'terms' );
-                wp_cache_set( 'last_changed', $last_changed + 1, 'terms' );
-        }
+        wp_cache_set( 'last_changed', microtime(), 'terms' );
 }