summaryrefslogtreecommitdiffstats
path: root/wp-inst/wp-includes/cache.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2005-11-18 13:47:42 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2005-11-18 13:47:42 +0000
commit56777d417dd3fefd42e44db4f60377709fccdf5a (patch)
tree163d1422f805827f7ba408260ccd9d9aaa6c5ea7 /wp-inst/wp-includes/cache.php
parent2b56b90f06b0018f0dba866e2d799cda640d9597 (diff)
downloadwordpress-mu-56777d417dd3fefd42e44db4f60377709fccdf5a.tar.gz
wordpress-mu-56777d417dd3fefd42e44db4f60377709fccdf5a.tar.xz
wordpress-mu-56777d417dd3fefd42e44db4f60377709fccdf5a.zip
WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@440 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-inst/wp-includes/cache.php')
-rw-r--r--wp-inst/wp-includes/cache.php3
1 files changed, 3 insertions, 0 deletions
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;
}