From 6ef7b48c2da1ad9731e1f4734be86ed3ae5afca0 Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Mon, 5 Feb 2007 11:49:12 +0000
Subject: WP Merge to rev 4865

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

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

diff --git a/wp-includes/cache.php b/wp-includes/cache.php
index 2232e15..b5a2b9d 100644
--- a/wp-includes/cache.php
+++ b/wp-includes/cache.php
@@ -217,22 +217,8 @@ class WP_Object_Cache {
 					$this->cache[$this->key( $catt->cat_ID, 'category' )] = $catt;
 				}
 			}
-		} else
-			if ('options' == $group) {
-				$wpdb->hide_errors();
-				if (!$options = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options WHERE autoload = 'yes'")) {
-					$options = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options");
-				}
-				$wpdb->show_errors();
-
-				if ( ! $options )
-					return;
+		}
 
-				foreach ($options as $option) {
-					$this->cache['options'][$option->option_name] = $option->option_value;
-					$this->cache[$this->key( $option->option_name, 'options' )] = $option->option_value;
-				}
-			}
 	}
 
 	function make_group_dir($group, $perms) {
-- 
cgit