From 7e007d8024faecc4d9a7f607dcba42a4cfa7bb5d Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Fri, 24 Oct 2008 15:39:15 +0000
Subject: And remove object cache calls from get() too

git-svn-id: http://svn.automattic.com/wordpress-mu/branches/2.6@1511 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-includes/rss.php | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/wp-includes/rss.php b/wp-includes/rss.php
index ff93504..5b3741c 100644
--- a/wp-includes/rss.php
+++ b/wp-includes/rss.php
@@ -690,23 +690,14 @@ class RSSCache {
 	Output:		cached object on HIT, false on MISS
 \*=======================================================================*/
 	function get ($url) {
-		global $wp_object_cache;
 		$this->ERROR = "";
 		$cache_option = 'rss_' . $this->file_name( $url );
 
-		if( $wp_object_cache->cache_enabled ) {
-			if( ! wp_cache_get( $cache_option, 'rss' ) ) {
-				$this->debug( "Cache doesn't contain: $url (cache option: $cache_option)" );
-				return 0;
-			}
-			return wp_cache_get( $cache_option, 'rss' );
-		} else {
-			if ( ! get_site_option( $cache_option ) ) {
-				$this->debug( "Cache doesn't contain: $url (cache option: $cache_option)" );
-				return 0;
-			}
-			return get_site_option( $cache_option );
+		if ( ! get_site_option( $cache_option ) ) {
+			$this->debug( "Cache doesn't contain: $url (cache option: $cache_option)" );
+			return 0;
 		}
+		return get_site_option( $cache_option );
 	}
 
 /*=======================================================================*\
-- 
cgit