From 56ebeff8a4a3c1c954ed56bfa2db8fbebd0f8593 Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Thu, 1 Feb 2007 21:27:11 +0000
Subject: Revert changes to options. Let's aim for 1.1.1 next week

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@877 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-includes/cache.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'wp-includes/cache.php')

diff --git a/wp-includes/cache.php b/wp-includes/cache.php
index 6b02ba3..daaeaeb 100644
--- a/wp-includes/cache.php
+++ b/wp-includes/cache.php
@@ -1,6 +1,7 @@
 <?php
 function wp_cache_add($key, $data, $flag = '', $expire = 0) {
 	global $wp_object_cache;
+	$data = unserialize(serialize($data));
 
 	return $wp_object_cache->add($key, $data, $flag, $expire);
 }
@@ -37,12 +38,14 @@ function wp_cache_init() {
 
 function wp_cache_replace($key, $data, $flag = '', $expire = 0) {
 	global $wp_object_cache;
+	$data = unserialize(serialize($data));
 
 	return $wp_object_cache->replace($key, $data, $flag, $expire);
 }
 
 function wp_cache_set($key, $data, $flag = '', $expire = 0) {
 	global $wp_object_cache;
+	$data = unserialize(serialize($data));
 
 	return $wp_object_cache->set($key, $data, $flag, $expire);
 }
@@ -212,8 +215,6 @@ class WP_Object_Cache {
 				foreach ($dogs as $catt) {
 					$this->cache['category'][$catt->cat_ID] = $catt;
 					$this->cache[$this->key( $catt->cat_ID, 'category' )] = $catt;
-				}
-			}
 		} else
 			if ('options' == $group) {
 				$wpdb->hide_errors();
@@ -227,7 +228,6 @@ class WP_Object_Cache {
 
 				foreach ($options as $option) {
 					$this->cache['options'][$option->option_name] = $option->option_value;
-					$this->cache[$this->key( $option->option_name, 'options' )] = $option->option_value;
 				}
 			}
 	}
-- 
cgit