From 56777d417dd3fefd42e44db4f60377709fccdf5a Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Fri, 18 Nov 2005 13:47:42 +0000
Subject: WP Merge

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

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

diff --git a/wp-inst/wp-includes/cache.php b/wp-inst/wp-includes/cache.php
index 7f3c066..34eda42 100644
--- a/wp-inst/wp-includes/cache.php
+++ b/wp-inst/wp-includes/cache.php
@@ -184,6 +184,9 @@ class WP_Object_Cache {
 				}
 				$wpdb->show_errors();
 
+				if ( ! $options )
+					return;
+
 				foreach ($options as $option) {
 					$this->cache['options'][$option->option_name] = $option->option_value;
 				}
-- 
cgit