WP Merge to rev 5499, this is a big one! Test it before you put it live!

Test only, not for production use yet


git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@972 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 2 insertions, 3 deletions

diff --git a/wp-includes/cache.php b/wp-includes/cache.php
index e89e5f6..6901a6b 100644
--- a/wp-includes/cache.php
+++ b/wp-includes/cache.php
@@ -364,10 +364,9 @@ class WP_Object_Cache {
 				fputs($fd, $serial);

 				fclose($fd);

 				if (!@ rename($temp_file, $cache_file)) {

-					if (@ copy($temp_file, $cache_file))

-						@ unlink($temp_file);

-					else

+					if (!@ copy($temp_file, $cache_file))

 						$errors++;

+					@ unlink($temp_file);

 				}

 				@ chmod($cache_file, $file_perms);

 			}